Refs #10977. Undefine macros defined by poco

mantidproject · Jan 27, 2015 · 8a53dae · 8a53dae
1 parent 3eab1df
commit 8a53dae
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp
@@ -10,6 +10,13 @@
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/V3D.h"
+// the following were previously defined in Poco/Platform_POSIX.h 
+#ifdef GCC_DIAG_ON 
+#undef GCC_DIAG_ON
+#endif
+#ifdef GCC_DIAG_OFF
+#undef GCC_DIAG_OFF
+#endif
 #include "MantidKernel/WarningSuppressions.h"
 #include <climits> // Needed for g++4.4 on Mac with OpenCASCADE 6.3.0
 #include <cmath>

diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryRenderer.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryRenderer.cpp
@@ -3,6 +3,13 @@
 #include "MantidGeometry/IObjComponent.h"
 #include "MantidKernel/V3D.h"
 #include "MantidKernel/Quat.h"
+// the following were previously defined in Poco/Platform_POSIX.h 
+#ifdef GCC_DIAG_ON 
+#undef GCC_DIAG_ON
+#endif
+#ifdef GCC_DIAG_OFF
+#undef GCC_DIAG_OFF
+#endif
 #include "MantidKernel/WarningSuppressions.h"
 #include <climits>
 

diff --git a/Code/Mantid/Framework/LiveData/src/ISISHistoDataListener.cpp b/Code/Mantid/Framework/LiveData/src/ISISHistoDataListener.cpp
@@ -11,6 +11,13 @@
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/ArrayBoundedValidator.h"
+// the following were previously defined in Poco/Platform_POSIX.h 
+#ifdef GCC_DIAG_ON 
+#undef GCC_DIAG_ON
+#endif
+#ifdef GCC_DIAG_OFF
+#undef GCC_DIAG_OFF
+#endif
 #include "MantidKernel/WarningSuppressions.h"
 #include "MantidGeometry/Instrument.h"
 

diff --git a/Code/Mantid/Framework/LiveData/src/ISISLiveEventDataListener.cpp b/Code/Mantid/Framework/LiveData/src/ISISLiveEventDataListener.cpp
@@ -9,6 +9,13 @@
 
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/TimeSeriesProperty.h"
+// the following were previously defined in Poco/Platform_POSIX.h 
+#ifdef GCC_DIAG_ON 
+#undef GCC_DIAG_ON
+#endif
+#ifdef GCC_DIAG_OFF
+#undef GCC_DIAG_OFF
+#endif
 #include "MantidKernel/WarningSuppressions.h"
 #include "MantidKernel/UnitFactory.h"
 

diff --git a/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp
@@ -5,14 +5,22 @@
 #include "MantidKernel/ThreadPool.h"
 #include "MantidKernel/ThreadScheduler.h"
 #include "MantidKernel/ThreadSchedulerMutexes.h"
-#include "MantidKernel/WarningSuppressions.h"
 #include "MantidMDEvents/MDBox.h"
 #include "MantidMDEvents/MDEvent.h"
 #include "MantidMDEvents/MDGridBox.h"
 #include <boost/math/special_functions/round.hpp>
 #include <ostream>
 #include "MantidKernel/Strings.h"
 
+// the following were previously defined in Poco/Platform_POSIX.h 
+#ifdef GCC_DIAG_ON 
+#undef GCC_DIAG_ON
+#endif
+#ifdef GCC_DIAG_OFF
+#undef GCC_DIAG_OFF
+#endif
+#include "MantidKernel/WarningSuppressions.h"
+
 using namespace Mantid;
 using namespace Mantid::Kernel;
 using namespace Mantid::API;

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -1,7 +1,6 @@
 #include "MantidAPI/AlgorithmFactory.h"
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/FileLoaderRegistry.h"
-#include "MantidKernel/WarningSuppressions.h"
 #include "MantidPythonInterface/kernel/PythonObjectInstantiator.h"
 
 #include <boost/python/class.hpp>
@@ -13,6 +12,15 @@
 // include of Python.h which it ensures is done correctly
 #include <frameobject.h>
 
+// the following were previously defined in Poco/Platform_POSIX.h 
+#ifdef GCC_DIAG_ON 
+#undef GCC_DIAG_ON
+#endif
+#ifdef GCC_DIAG_OFF
+#undef GCC_DIAG_OFF
+#endif
+#include "MantidKernel/WarningSuppressions.h"
+
 using namespace Mantid::API;
 using namespace boost::python;
 using Mantid::Kernel::AbstractInstantiator;

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
@@ -1,6 +1,5 @@
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/IFunction.h"
-#include "MantidKernel/WarningSuppressions.h"
 #include "MantidPythonInterface/kernel/PythonObjectInstantiator.h"
 #include "MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h"
 
@@ -11,6 +10,15 @@
 // include of Python.h which it ensures is done correctly
 #include <frameobject.h>
 
+// the following were previously defined in Poco/Platform_POSIX.h 
+#ifdef GCC_DIAG_ON 
+#undef GCC_DIAG_ON
+#endif
+#ifdef GCC_DIAG_OFF
+#undef GCC_DIAG_OFF
+#endif
+#include "MantidKernel/WarningSuppressions.h"
+
 using Mantid::API::FunctionFactoryImpl;
 using Mantid::API::FunctionFactory;
 using Mantid::API::IFunction;