Refs #6315. Fixing Intel warnings.

mantidproject · Apr 29, 2013 · 44f1b90 · 44f1b90
1 parent bb9c88f
commit 44f1b90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkRectilinearGrid_Silent.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkRectilinearGrid_Silent.h
@@ -1,14 +1,14 @@
 #ifndef VTKRECTILINEARGRID_SILENT_H
 #define VTKRECTILINEARGRID_SILENT_H
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
   #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
     #pragma GCC diagnostic push
   #endif
   #pragma GCC diagnostic ignored "-Wconversion"
 #endif
 #include <vtkRectilinearGrid.h>
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
   #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
     #pragma GCC diagnostic pop
   #endif

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkStructuredGrid_Silent.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkStructuredGrid_Silent.h
@@ -1,14 +1,14 @@
 #ifndef VTKSTRUCTUREDGRID_SILENT_H
 #define VTKSTRUCTUREDGRID_SILENT_H
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
   #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
     #pragma GCC diagnostic push
   #endif
   #pragma GCC diagnostic ignored "-Wconversion"
 #endif
 #include <vtkStructuredGrid.h>
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
   #if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6 )
     #pragma GCC diagnostic pop
   #endif