Refs #4399. Fix converter template instantiations.

mantidproject · Feb 20, 2012 · a602786 · a602786
1 parent b7049d7
commit a602786
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/MatrixToNDArray.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/MatrixToNDArray.cpp
@@ -40,15 +40,8 @@ namespace Mantid { namespace PythonInterface
       #define INSTANTIATE(ElementType) \
         template DLLExport PyObject * wrapWithNDArray<ElementType>(const Kernel::Matrix<ElementType> &, const WrapMode);
 
-      INSTANTIATE(int16_t);
-      INSTANTIATE(uint16_t);
-      INSTANTIATE(int32_t);
-      INSTANTIATE(uint32_t);
-      INSTANTIATE(int64_t);
-      INSTANTIATE(uint64_t);
-#ifdef __APPLE__
-      INSTANTIATE(unsigned long);
-#endif
+      INSTANTIATE(int);
+      INSTANTIATE(float);
       INSTANTIATE(double);
 
     }

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayTypeIndex.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayTypeIndex.cpp
@@ -33,6 +33,8 @@ namespace Mantid
 #endif
       DEFINE_TYPE_MAPPING(uint64_t, NPY_UINT64);
       DEFINE_TYPE_MAPPING(double, NPY_DOUBLE);
+      DEFINE_TYPE_MAPPING(float, NPY_FLOAT);
+
     }
   }
 }