Skip to content
Snippets Groups Projects
Verified Commit 2c12261d authored by Justin Carpentier's avatar Justin Carpentier
Browse files

core: fix support of int32 and int64 support on Windows platforms

parent 03775d2e
No related branches found
No related tags found
No related merge requests found
Pipeline #35644 passed with warnings
......@@ -24,14 +24,20 @@ bool np_type_is_convertible_into_scalar(const int np_type) {
if (NumpyEquivalentType<Scalar>::type_code == np_type) return true;
switch (np_type) {
#ifdef WIN32
case NPY_INT:
case NPY_LONG:
return FromTypeToType<int, Scalar>::value;
#ifdef WIN32
case NPY_INT64:
case NPY_LONGLONG:
return FromTypeToType<__int64, Scalar>::value;
#endif
#else
case NPY_INT:
return FromTypeToType<int, Scalar>::value;
case NPY_LONG:
case NPY_LONGLONG:
return FromTypeToType<long, Scalar>::value;
#endif
case NPY_FLOAT:
return FromTypeToType<float, Scalar>::value;
case NPY_CFLOAT:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment