Skip to content

fix: guard size_t template specializations for 64-bit Unix (__LP64__) #186

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

Open
svenangerer wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

fix: guard size_t template specializations for 64-bit Unix (__LP64__) #186

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
4 changes: 2 additions & 2 deletions matlab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ mxArray* wrap<bool>(const bool& value) {
}

// specialization to size_t but skip Win64 size check & CUDACC check
#if !defined(_WIN64) || defined(__CUDACC__)
#if (!defined(_WIN64) && !defined(__LP64__)) || defined(__CUDACC__)
template<>
mxArray* wrap<size_t>(const size_t& value) {
mxArray *result = scalar(mxUINT32OR64_CLASS);
Expand Down Expand Up @@ -351,7 +351,7 @@ uint64_t unwrap<uint64_t>(const mxArray* array) {
// specialization to size_t; omit it on Win64 because size_t is uint64_t there
// and would duplicate unwrap<uint64_t>. The __CUDACC__ case intentionally
// bypasses the Win64 guard when compiling with CUDA.
#if !defined(_WIN64) || defined(__CUDACC__)
#if (!defined(_WIN64) && !defined(__LP64__)) || defined(__CUDACC__)
template<>
size_t unwrap<size_t>(const mxArray* array) {
checkScalar(array, "unwrap<size_t>");
Expand Down