Sync/update wrap subtree#2587
Conversation
0ba6534a9 Merge pull request borglab#186 from svenangerer/fix-linux-size_t 211bba1ba fix: guard size_t template specializations for 64-bit Unix (__LP64__) f1743dfee Merge pull request borglab#183 from thatdudegrantt/fix/matlab-size_t-win64-duplicate b330797be Updating comments on copilot's suggestion 5fe01237e fix: guard size_t template specializations for Win64 git-subtree-dir: wrap git-subtree-split: 0ba6534a9f01a7e8f0b0422b33ebd07c8a7bdd3c
|
@dellaert I had to open a new PR when resyncing via |
|
I don't follow :-) Which PR? And what should happen with this one? |
|
This one also has changes in wrap sub-tree... |
|
i guess I am confused, how do I ensure there are no changes to the subtree? when I ran the update_wrap.sh within my gtsam fork, it pulled from the master which contained the merges from 183 and 186, which changes matlab.h. Is there something I am missing within the readme/proper way to update this? Thank you so much for your help, I really appreciate it. For context, PR #2572 was the previous version of this sync which it was closed accidentally when I deleted the branch during cleanup, as I was hoping running the update_wrap.sh on a new branch would solve the issue of not properly syncing the changes from borglab/wrap to the gtsam/wrap subtree. This PR (#2587) is the replacement, created fresh using update_wrap.sh as described in the wrap README, but contains the same content found in the #2572. |
aa4a5a6d7 Merge pull request borglab#187 from thatdudegrantt/fix/matlab-noisemodel-virtual-downcast 29d4073ec Fix MATLAB wrapper virtual class downcasting for namespaced types git-subtree-dir: wrap git-subtree-split: aa4a5a6d7a50bffcd6b37fe45f89813554743330
|
I think I was confused. @ProfFan reviewed the wrap PR and I synced it in this PR. That added changes in seven more files. I'm running CI and once that passes I'll merge. Thank you, @thatdudegrantt ! |
2 participants
What this does
Syncs the
gtsam/wrap/subtree with the currentborglab/wrapmaster branch usingupdate_wrap.sh. This pulls in:wrap<size_t>andunwrap<size_t>specializations inmatlab.hwith#if !defined(_WIN64)to prevent duplicate template specialization errors on Win64 MSVC builds!defined(__LP64__)Changes
Guards
wrap<size_t>andunwrap<size_t>specializations inmatlab.hwith#if (!defined(_WIN64) && !defined(__LP64__)) || defined(__CUDACC__)to prevent the collision on 64-bit systems wheresize_tanduint64_tresolve to the same underlying type.Testing
Fix was locally verified on Windows 11 x64, Visual Studio 2026 Community (MSVC 19.51), MATLAB R2026a, CMake 4.2.3. Fixes #2505.
Process
Synced using
update_wrap.shagainst borglab/wrap master, producing the canonical 2 commits (squash + merge) as described in the wrap README.