Refs #4204. Fix for RHEL5 build and kill some warnings.

mantidproject · Nov 28, 2011 · 946b49a · 946b49a
1 parent be5e887
commit 946b49a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/PythonAPI/src/boostpython.cpp b/Code/Mantid/Framework/PythonAPI/src/boostpython.cpp
@@ -27,6 +27,7 @@
   #pragma GCC diagnostic ignored "-Wunused-parameter"
   #pragma GCC diagnostic ignored "-Wtype-limits"
   #pragma GCC diagnostic ignored "-Wunused-value"
+  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif
 
 #include "boostpython/converter/arg_to_python_base.cpp"

diff --git a/Code/Mantid/Framework/PythonAPI/src/boostpython/object/inheritance.cpp b/Code/Mantid/Framework/PythonAPI/src/boostpython/object/inheritance.cpp
@@ -10,7 +10,11 @@
 #endif 
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/reverse_graph.hpp>
-#include <boost/property_map/property_map.hpp>
+#if BOOST_VERSION >=103800
+  #include <boost/property_map/property_map.hpp>
+#else
+  #include <boost/property_map.hpp>
+#endif
 #include <boost/bind.hpp>
 #include <boost/integer_traits.hpp>
 #include <boost/tuple/tuple.hpp>