diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx index bed94575dc16..19195c200331 100644 --- 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 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 index 5137f51ece56..f216f3d4ee76 100644 --- a/Code/Mantid/Vates/VatesAPI/test/BoxInfoTest.h +++ b/Code/Mantid/Vates/VatesAPI/test/BoxInfoTest.h @@ -5,7 +5,7 @@ #include -#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 index 99e8edb4d405..20058d0a2045 100644 --- 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 #include -#pragma GCC diagnostic ignored "-Wstrict-aliasing" #include #include @@ -279,6 +279,7 @@ pqPipelineRepresentation *ViewBase::getPvActiveRep() return qobject_cast(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.