Refs #4399. Fix include that isn't in all numpy versions

mantidproject · Feb 16, 2012 · c240c7b · c240c7b
1 parent 10dddf2
commit c240c7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.../Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/NDArrayTypeIndex.h b/.../Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/NDArrayTypeIndex.h
@@ -23,7 +23,10 @@
 */
 #include "MantidKernel/System.h"
 #include <boost/python/detail/prefix.hpp> // Safe include of Python.h
-#include <numpy/ndarraytypes.h>
+
+//#define PY_ARRAY_UNIQUE_SYMBOL KERNEL_ARRAY_API
+#define NO_ARRAY_IMPORT
+#include <numpy/ndarrayobject.h> 
 
 namespace Mantid
 {

diff --git a/...antid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVectorConverter.cpp b/...antid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVectorConverter.cpp
@@ -5,10 +5,6 @@
 #include "MantidPythonInterface/kernel/Converters/NDArrayTypeIndex.h"
 #include <boost/python/extract.hpp>
 
-//#define PY_ARRAY_UNIQUE_SYMBOL KERNEL_ARRAY_API
-#define NO_ARRAY_IMPORT
-#include <numpy/ndarrayobject.h> 
-
 namespace Mantid
 {
   namespace PythonInterface