From af586c388b8272c68820d6e19ef5f88231decb4a Mon Sep 17 00:00:00 2001 From: Steven Hahn Date: Tue, 27 Jan 2015 13:09:35 -0500 Subject: [PATCH] Revert "Refs #10977. Undefine macros defined by poco" This reverts commit 8a53dae646b3e51b6d333ce83d73a051ba003ce5. --- .../Geometry/src/Rendering/OCGeometryGenerator.cpp | 7 ------- .../Geometry/src/Rendering/OCGeometryRenderer.cpp | 7 ------- .../Framework/LiveData/src/ISISHistoDataListener.cpp | 7 ------- .../LiveData/src/ISISLiveEventDataListener.cpp | 7 ------- Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp | 10 +--------- .../mantid/api/src/Exports/AlgorithmFactory.cpp | 10 +--------- .../mantid/api/src/Exports/FunctionFactory.cpp | 10 +--------- 7 files changed, 3 insertions(+), 55 deletions(-) diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp index 205da4d17f7c..bab1459e647d 100644 --- 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 // Needed for g++4.4 on Mac with OpenCASCADE 6.3.0 #include diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryRenderer.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryRenderer.cpp index f4c763b01270..d67a87c881ba 100644 --- 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 diff --git a/Code/Mantid/Framework/LiveData/src/ISISHistoDataListener.cpp b/Code/Mantid/Framework/LiveData/src/ISISHistoDataListener.cpp index 100c4cb03033..842e6ecf731e 100644 --- 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 index b0ab43b1024b..61c306734bb1 100644 --- 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 index 292d52b5e7c0..aea14a031982 100644 --- a/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp +++ b/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp @@ -5,6 +5,7 @@ #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" @@ -12,15 +13,6 @@ #include #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 index ef59c3ad656a..12bfc84afbc6 100644 --- 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 @@ -12,15 +13,6 @@ // include of Python.h which it ensures is done correctly #include -// 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 index f123a149863b..d00e88e34f35 100644 --- 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 -// 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;