Revert "Refs #10977. Undefine macros defined by poco"

This reverts commit 8a53dae.
mantidproject · Jan 27, 2015 · af586c3 · af586c3
1 parent 8a53dae
commit af586c3
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 55 deletions.
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp
@@ -10,13 +10,6 @@
 #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,13 +3,6 @@
 #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,13 +11,6 @@
 #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,13 +9,6 @@
 
 #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,22 +5,14 @@
 #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,6 +1,7 @@
 #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>
@@ -12,15 +13,6 @@
 // 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,5 +1,6 @@
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/IFunction.h"
+#include "MantidKernel/WarningSuppressions.h"
 #include "MantidPythonInterface/kernel/PythonObjectInstantiator.h"
 #include "MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h"
 
@@ -10,15 +11,6 @@
 // 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;