Re #6267. gcc 4.4 doesn't understand 'diagnostic push/pop'.

mantidproject · Dec 14, 2012 · 225875b · 225875b
1 parent 11ac099
commit 225875b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -446,7 +446,6 @@ namespace Mantid
   #pragma warning(disable: 4804) // This one comes about for TYPE=bool - again the method is never called for this type
 #endif
 #if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wconversion"
 #endif
 
@@ -611,7 +610,7 @@ namespace Mantid
   #pragma warning(pop)
 #endif
 #if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
-  #pragma GCC diagnostic pop
+  #pragma GCC diagnostic warning "-Wconversion"
 #endif
 
     /**