Skip to content

Fix MATLAB 2024a MEX build: resolve size_t and uint64_t template collision #2553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
svenangerer wants to merge 1 commit into from
+14 −12
Closed

Fix MATLAB 2024a MEX build: resolve size_t and uint64_t template collision #2553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions wrap/matlab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <gtsam/geometry/Point2.h>
#include <gtsam/geometry/Point3.h>
#include <gtsam/base/utilities.h>
#include <type_traits>

using gtsam::Vector;
using gtsam::Matrix;
Expand All @@ -37,7 +38,6 @@ extern "C" {
#include <mex.h>
}

#include <limits>
#include <list>
#include <set>
#include <sstream>
Expand Down Expand Up @@ -177,12 +177,12 @@ mxArray* wrap<int>(const int& value) {
}

// specialization to gtsam::Key which is an alias for uint64_t
template<>
mxArray* wrap<uint64_t>(const uint64_t& value) {
mxArray *result = scalar(mxUINT32OR64_CLASS);
*(uint64_t*)mxGetData(result) = value;
return result;
}
//template<>
//mxArray* wrap<uint64_t>(const uint64_t& value) {
// mxArray *result = scalar(mxUINT32OR64_CLASS);
// *(uint64_t*)mxGetData(result) = value;
// return result;
//}

// specialization to double -> just double
template<>
Expand Down Expand Up @@ -347,11 +347,11 @@ uint64_t unwrap<uint64_t>(const mxArray* array) {
}

// specialization to size_t
template<>
size_t unwrap<size_t>(const mxArray* array) {
checkScalar(array, "unwrap<size_t>");
return myGetScalar<size_t>(array);
}
//template<>
//size_t unwrap<size_t>(const mxArray* array) {
// checkScalar(array, "unwrap<size_t>");
// return myGetScalar<size_t>(array);
//}

// specialization to double
template<>
Expand Down Expand Up @@ -573,3 +573,5 @@ Class* unwrap_ptr(const mxArray* obj, const string& propertyName) {
// static_assert(unwrap_shared_ptr_Matrix_attempted, "Matrix cannot be unwrapped as a shared pointer");
// return Matrix();
//}