fix: sync wrap subtree with borglab/wrap master (Win64 size_t guard)#2572
Closed
thatdudegrantt wants to merge 4 commits into
Closed
fix: sync wrap subtree with borglab/wrap master (Win64 size_t guard)#2572thatdudegrantt wants to merge 4 commits into
thatdudegrantt wants to merge 4 commits into
Conversation
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: f1743dfeee858ab3e8966b9e8ddb4e6ead45b827
Member
|
I merged the other wrap PR so could you maybe re-sync in this PR again? |
0ba6534a9 Merge pull request borglab#186 from svenangerer/fix-linux-size_t 211bba1ba fix: guard size_t template specializations for 64-bit Unix (__LP64__) git-subtree-dir: wrap git-subtree-split: 0ba6534a9f01a7e8f0b0422b33ebd07c8a7bdd3c
Contributor
Author
Sounds good I'll do that right now! |
Contributor
Author
dellaert
requested changes
Jun 25, 2026
dellaert
left a comment
dellaert
left a comment
Member
There was a problem hiding this comment.
There still is a change in the wrap subtree at the moment.
Member
|
@thatdudegrantt ping :-) |
Contributor
Author
|
Hi there, I am currently in the progress of updating it after reviewing the proper way of updating subtree, so I am closing this and will open a new updated one. Thank you for the reping! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this does
Syncs the
gtsam/wrap/subtree with the currentborglab/wrapmaster branch usinggit subtree pullagainst the upstream wrap repository. This pulls in borglab/wrap PR 183 which resolves duplicate explicit template specialization errors when building the MATLAB wrapper on 64-bit Windows, where size_t and uint64_t resolve to the same underlying type.Changes
Guards
wrap<size_t>andunwrap<size_t>specializations in matlab.h with#if !defined(_WIN64) || defined(CUDACC)to prevent the collision on Win64 MSVC builds.Testing
Fix was locally verified on Windows 11 x64, Visual Studio 2026 Community (MSVC 19.51), MATLAB R2026a, CMake 4.2.3. Populates fixes for #2505 within
gtsam/wrap.Note
A follow-up sync will be needed if borglab/wrap PR 186 is merged.