Refs #7363. Quieting compiler warnings on modern GCC.

mantidproject · Oct 9, 2014 · f1a2a19 · f1a2a19
1 parent 27cae0c
commit f1a2a19
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 4 deletions.
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/NexusPeaksReader/vtkNexusPeaksReader.h b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/NexusPeaksReader/vtkNexusPeaksReader.h
@@ -1,6 +1,6 @@
 #ifndef _vtkEventNexusReader_h
 #define _vtkEventNexusReader_h
-#include "vtkPolyDataAlgorithm.h"
+#include "MantidVatesAPI/vtkPolyDataAlgorithm_Silent.h"
 #include "MantidAPI/IPeaksWorkspace.h"
 
 class vtkImplicitFunction;

diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.h b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.h
@@ -1,6 +1,6 @@
 #ifndef _vtkEventNexusReader_h
 #define _vtkEventNexusReader_h
-#include "vtkPolyDataAlgorithm.h"
+#include "MantidVatesAPI/vtkPolyDataAlgorithm_Silent.h"
 #include "MantidAPI/IPeaksWorkspace.h"
 
 class vtkImplicitFunction;

diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.h b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.h
@@ -3,7 +3,7 @@
 
 #include "MantidAPI/IPeaksWorkspace.h"
 #include "MantidVatesAPI/vtkPeakMarkerFactory.h"
-#include "vtkPolyDataAlgorithm.h"
+#include "MantidVatesAPI/vtkPolyDataAlgorithm_Silent.h"
 #include <string>
 
 /**

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkGlyph3D_Silent.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkGlyph3D_Silent.h
@@ -0,0 +1,17 @@
+#ifndef VTKGLYPH3D_SILENT_H
+#define VTKGLYPH3D_SILENT_H
+
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 8 )
+    #pragma GCC diagnostic push
+  #endif
+  #pragma GCC diagnostic ignored "-Wconversion"
+#endif
+#include <vtkGlyph3D.h>
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 8 )
+    #pragma GCC diagnostic pop
+  #endif
+#endif
+
+#endif // VTKGLYPH3D_SILENT_H
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkPolyDataAlgorithm_Silent.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkPolyDataAlgorithm_Silent.h
@@ -0,0 +1,17 @@
+#ifndef VTKPOLYDATAALGORITHM_SILENT_H
+#define VTKPOLYDATAALGORITHM_SILENT_H
+
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 8 )
+    #pragma GCC diagnostic push
+  #endif
+  #pragma GCC diagnostic ignored "-Wconversion"
+#endif
+#include <vtkPolyDataAlgorithm.h>
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
+  #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 8 )
+    #pragma GCC diagnostic pop
+  #endif
+#endif
+
+#endif // VTKPOLYDATAALGORITHM_SILENT_H
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkPeakMarkerFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkPeakMarkerFactory.cpp
@@ -6,7 +6,7 @@
 #include "MantidAPI/IPeak.h"
 #include "MantidKernel/V3D.h"
 #include <vtkVertex.h>
-#include <vtkGlyph3D.h>
+#include "MantidVatesAPI/vtkGlyph3D_Silent.h"
 #include <vtkSphereSource.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkFloatArray.h>