Refs #6315. Dealing with Unix warnings.

mantidproject · Apr 26, 2013 · bf3558d · bf3558d
1 parent a3de13d
commit bf3558d
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 16 deletions.
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkRectilinearGrid_Silent.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkRectilinearGrid_Silent.h
@@ -0,0 +1,17 @@
+#ifndef VTKRECTILINEARGRID_SILENT_H
+#define VTKRECTILINEARGRID_SILENT_H
+
+#if defined(__GNUC__)
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
+    #pragma GCC diagnostic push
+  #endif
+  #pragma GCC diagnostic ignored "-Wconversion"
+#endif
+#include <vtkRectilinearGrid.h>
+#if defined(__GNUC__)
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
+    #pragma GCC diagnostic pop
+  #endif
+#endif
+
+#endif // VTKRECTILINEARGRID_SILENT_H
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkStructuredGrid_Silent.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkStructuredGrid_Silent.h
@@ -0,0 +1,17 @@
+#ifndef VTKSTRUCTUREDGRID_SILENT_H
+#define VTKSTRUCTUREDGRID_SILENT_H
+
+#if defined(__GNUC__)
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
+    #pragma GCC diagnostic push
+  #endif
+  #pragma GCC diagnostic ignored "-Wconversion"
+#endif
+#include <vtkStructuredGrid.h>
+#if defined(__GNUC__)
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
+    #pragma GCC diagnostic pop
+  #endif
+#endif
+
+#endif // VTKSTRUCTUREDGRID_SILENT_H
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkDataSetFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkDataSetFactoryTest.h
@@ -12,7 +12,7 @@
 #include "MantidAPI/Workspace.h"
 #include "MantidAPI/IMDHistoWorkspace.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid::API;
 using namespace Mantid::MDEvents;

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToGeometryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToGeometryTest.h
@@ -8,7 +8,7 @@
 
 #include "vtkFieldData.h"
 #include "vtkCharArray.h"
-#include "vtkRectilinearGrid.h"
+#include "MantidVatesAPI/vtkRectilinearGrid_Silent.h"
 
 #include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
 

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToImplicitFunctionTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToImplicitFunctionTest.h
@@ -6,7 +6,7 @@
 #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
 #include "MockObjects.h"
 #include <vtkDataSet.h>
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid::VATES;
 
@@ -65,4 +65,4 @@ class vtkDataSetToImplicitFunctionTest : public CxxTest::TestSuite
 
 };
 
-#endif
+#endif
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToNonOrthogonalDataSetTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToNonOrthogonalDataSetTest.h
@@ -15,7 +15,7 @@
 #include <vtkFieldData.h>
 #include <vtkFloatArray.h>
 #include <vtkPoints.h>
-#include <vtkRectilinearGrid.h>
+#include "MantidVatesAPI/vtkRectilinearGrid_Silent.h"
 #include <vtkUnstructuredGrid.h>
 
 using namespace Mantid::API;

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToWsLocationTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToWsLocationTest.h
@@ -4,7 +4,7 @@
 #include <cxxtest/TestSuite.h>
 #include "MantidVatesAPI/vtkDataSetToWsLocation.h"
 #include <vtkDataSet.h>
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 #include "MockObjects.h"
 
 using namespace Mantid::VATES;
@@ -55,4 +55,4 @@ class vtkDataSetToWsLocationTest : public CxxTest::TestSuite
 
 };
 
-#endif
+#endif
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToWsNameTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkDataSetToWsNameTest.h
@@ -4,7 +4,7 @@
 #include <cxxtest/TestSuite.h>
 #include "MantidVatesAPI/vtkDataSetToWsName.h"
 #include "MockObjects.h"
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid::VATES;
 
@@ -55,4 +55,4 @@ class vtkDataSetToWsNameTest : public CxxTest::TestSuite
 
 };
 
-#endif
+#endif
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h
@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 #include <vtkCellData.h>
 #include <vtkDataArray.h>
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid;
 using namespace Mantid::VATES;

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h
@@ -10,7 +10,7 @@
 #include "MantidVatesAPI/NoThresholdRange.h"
 #include "MockObjects.h"
 #include <cxxtest/TestSuite.h>
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid;
 using namespace Mantid::MDEvents;

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h
@@ -10,7 +10,7 @@
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid;
 using namespace Mantid::API;

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h
@@ -10,7 +10,7 @@
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid;
 using namespace Mantid::MDEvents;

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h
@@ -8,7 +8,7 @@
 #include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
 #include "MockObjects.h"
 #include <cxxtest/TestSuite.h>
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDLineFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDLineFactoryTest.h
@@ -9,7 +9,7 @@
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include "vtkCellType.h"
 #include "vtkUnstructuredGrid.h"
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid::VATES;
 using namespace Mantid::API;

diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDQuadFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDQuadFactoryTest.h
@@ -9,7 +9,7 @@
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include "vtkCellType.h"
 #include "vtkUnstructuredGrid.h"
-#include <vtkStructuredGrid.h>
+#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
 
 using namespace Mantid::VATES;
 using namespace Mantid::API;