Refs #4399. Fix the Mac build

The Mac seems to need definitions of unsigned long that are not covered by uint64_t like Linux
mantidproject · Feb 16, 2012 · 1a21b99 · 1a21b99
1 parent 1c0a76b
commit 1a21b99
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/.../Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/NDArrayTypeIndex.h b/.../Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/NDArrayTypeIndex.h
@@ -63,6 +63,9 @@ namespace Mantid
       DEFINE_TYPE_MAPPING(int32_t, NPY_INT32);
       DEFINE_TYPE_MAPPING(uint32_t, NPY_UINT32);
       DEFINE_TYPE_MAPPING(int64_t, NPY_INT64);
+#ifdef __APPLE__
+      DEFINE_TYPE_MAPPING(unsigned long, NPY_ULONG);
+#endif
       DEFINE_TYPE_MAPPING(uint64_t, NPY_UINT64);
       DEFINE_TYPE_MAPPING(double, NPY_DOUBLE);
       // Not needed outside here

diff --git a/...antid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVectorConverter.cpp b/...antid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVectorConverter.cpp
@@ -159,6 +159,9 @@ namespace Mantid
     template DLLExport struct NDArrayToVectorConverter<uint32_t>;
     template DLLExport struct NDArrayToVectorConverter<int64_t>;
     template DLLExport struct NDArrayToVectorConverter<uint64_t>;
+#ifdef __APPLE__
+    template DLLExport struct NDArrayToVectorConverter<unsigned long>;
+#endif
     template DLLExport struct NDArrayToVectorConverter<double>;
     template DLLExport struct NDArrayToVectorConverter<std::string>;
   }

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/SequenceTypeHandler.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/SequenceTypeHandler.cpp
@@ -70,6 +70,9 @@ namespace Mantid
       template DLLExport struct SequenceTypeHandler<std::vector<uint32_t> >;
       template DLLExport struct SequenceTypeHandler<std::vector<int64_t> >;
       template DLLExport struct SequenceTypeHandler<std::vector<uint64_t> >;
+#ifdef __APPLE__
+      template DLLExport struct SequenceTypeHandler<std::vector<unsigned long> >;
+#endif
       template DLLExport struct SequenceTypeHandler<std::vector<double> >;
       template DLLExport struct SequenceTypeHandler<std::vector<std::string> >;
     }

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/TypeRegistry.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/TypeRegistry.cpp
@@ -56,6 +56,9 @@ namespace Mantid
         REGISTER_ARRAYPROPERTY_HANDLER(std::vector<uint32_t>);
         REGISTER_ARRAYPROPERTY_HANDLER(std::vector<int64_t>);
         REGISTER_ARRAYPROPERTY_HANDLER(std::vector<uint64_t>);
+#ifdef __APPLE__
+        REGISTER_ARRAYPROPERTY_HANDLER(std::vector<unsigned long>);
+#endif
         REGISTER_ARRAYPROPERTY_HANDLER(std::vector<double>);
         REGISTER_ARRAYPROPERTY_HANDLER(std::vector<std::string>);