From 225875b19882d37a1b406d1de31968a5ba95b62b Mon Sep 17 00:00:00 2001 From: Russell Taylor Date: Fri, 14 Dec 2012 10:34:41 -0500 Subject: [PATCH] Re #6267. gcc 4.4 doesn't understand 'diagnostic push/pop'. --- Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp index b653bfae882c..055a9d29cd05 100644 --- 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 /**