Refs #11814 Refactor pragmas

mantidproject · May 29, 2015 · 5b63dd8 · 5b63dd8
1 parent cf3b62b
commit 5b63dd8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
@@ -21,8 +21,8 @@
 #include "MantidVatesAPI/vtkMD0DFactory.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
+#include "MantidKernel/WarningSuppressions.h"
 
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #include <boost/optional.hpp>
 
 using namespace Mantid::VATES;
@@ -235,6 +235,7 @@ int vtkMDEWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf
   return 1;
 }
 
+GCC_DIAG_OFF(strict-aliasing)
 int vtkMDEWSource::RequestInformation(vtkInformation *vtkNotUsed(request), vtkInformationVector **vtkNotUsed(inputVector), vtkInformationVector *outputVector)
 {
   if(m_presenter == NULL && !m_wsName.empty())

diff --git a/Code/Mantid/Vates/VatesAPI/test/BoxInfoTest.h b/Code/Mantid/Vates/VatesAPI/test/BoxInfoTest.h
@@ -5,7 +5,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#include "MantidKernel/WarningSuppressions.h"
 #include "MantidVatesAPI/BoxInfo.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/BoxController.h"
@@ -48,6 +48,7 @@ class BoxInfoTest : public CxxTest::TestSuite {
     AnalysisDataService::Instance().remove(wsName);
   }
 
+  GCC_DIAG_OFF(strict-aliasing)
   void test_initial_recursion_depth_is_1_for_MD_Event_w_split() {
     // Arrange
     const std::string wsName = "MD_EVENT_WS_WITH_SPLITTING";

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp
@@ -4,6 +4,7 @@
 #include "MantidVatesAPI/ADSWorkspaceProvider.h"
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidVatesAPI/BoxInfo.h"
+#include "MantidKernel/WarningSuppressions.h"
 #if defined(__INTEL_COMPILER)
   #pragma warning disable 1170
 #endif
@@ -39,7 +40,6 @@
 #include <QPointer>
 #include <QSet>
 
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #include <boost/optional.hpp>
 #include <stdexcept>
 
@@ -279,6 +279,7 @@ pqPipelineRepresentation *ViewBase::getPvActiveRep()
   return qobject_cast<pqPipelineRepresentation *>(drep);
 }
 
+GCC_DIAG_OFF(strict-aliasing)
 /**
  * This function creates a ParaView source from a given plugin name and
  * workspace name. This is used in the plugin mode of the simple interface.