Suppress warnings from other compilers.

Framework/Algorithms/test/RebinByTimeBaseTest.h

@@ -68,8 +68,10 @@ createEventWorkspace(const int numberspectra, const int nDistrubutedEvents,
   return retVal;
 }
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 /*
  This type is an IEventWorkspace, but not an EventWorkspace.
@@ -108,7 +110,10 @@ private:
 };
 }
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma gcc diagnostic pop
+#endif
+
 //=====================================================================================
 // Functional Tests
 //=====================================================================================

Framework/Crystal/test/MockObjects.h

@@ -16,8 +16,10 @@
 namespace Mantid {
 namespace Crystal {
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 // Mock Background strategy
 class MockBackgroundStrategy : public BackgroundStrategy {
@@ -49,7 +51,9 @@ public:
   }
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 }
 }
 

Framework/Crystal/test/PeakBackgroundTest.h

@@ -32,8 +32,10 @@ IPeaksWorkspace_sptr make_peaks_workspace(const V3D &hklPeak) {
   return peakWS;
 }
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 // Mock Background strategy
 class MockIMDIterator : public IMDIterator {
@@ -161,6 +163,8 @@ public:
   }
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 
 #endif /* MANTID_CRYSTAL_PEAKBACKGROUNDTEST_H_ */

Framework/DataObjects/test/MockObjects.h

@@ -19,8 +19,10 @@ public:
   ~MockPeakShapeFactory() override {}
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockPeakShape : public Mantid::Geometry::PeakShape {
 public:
@@ -37,6 +39,8 @@ public:
 }
 }
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 
 #endif /* MOCKOBJECTS_H_ */

Framework/Geometry/test/MockObjects.h

@@ -21,8 +21,10 @@ using boost::regex;
 
 namespace {
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 /*------------------------------------------------------------
  Mock Peak Transform
@@ -112,6 +114,8 @@ public:
   MOCK_CONST_METHOD0(getPeakShape, const Mantid::Geometry::PeakShape &());
 };
 }
-
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
+
 #endif /* MANTIDGEOMETRYTEST_MOCKOBJECTS_H_ */

Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiMockInstrumentHelpers.h

@@ -35,8 +35,10 @@ using namespace Geometry;
 
 typedef std::pair<double, double> DoublePair;
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockDetector : public PoldiAbstractDetector {
 protected:
@@ -391,7 +393,9 @@ public:
   }
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 
 class PoldiPeakCollectionHelpers {
   /* This class contains some static helper function to create

Framework/SINQ/test/PoldiSpectrumPawleyFunctionTest.h

@@ -21,8 +21,10 @@ using namespace Mantid::Kernel;
 using ::testing::_;
 using ::testing::Mock;
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockPawleyFunction : public IPawleyFunction {
 public:
@@ -191,6 +193,8 @@ private:
   PoldiInstrumentAdapter_sptr m_instrument;
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 
 #endif /* MANTID_SINQ_POLDISPECTRUMPAWLEYFUNCTIONTEST_H_ */

MantidQt/API/test/SignalRangeTest.h

@@ -10,8 +10,10 @@
 
 #include "MantidAPI/IMDIterator.h"
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class SignalRangeTest : public CxxTest::TestSuite {
 private:
@@ -202,5 +204,8 @@ public:
     TS_ASSERT_DELTA(5.0, range.maxValue(), 1e-10);
   }
 };
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
+
 #endif /* MANTIDQT_API_SIGNALRANGETEST */

MantidQt/CustomInterfaces/test/ALCBaselineModellingPresenterTest.h

@@ -17,9 +17,10 @@ using namespace MantidQt::CustomInterfaces;
 using namespace testing;
 using boost::scoped_ptr;
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
-
+#endif
 class MockALCBaselineModellingView : public IALCBaselineModellingView {
 public:
   void requestFit() { emit fitRequested(); }
@@ -364,5 +365,8 @@ public:
     m_view->help();
   }
 };
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
+
 #endif /* MANTIDQT_CUSTOMINTERFACES_ALCBASELINEMODELLINGTEST_H_ */

MantidQt/CustomInterfaces/test/ALCDataLoadingPresenterTest.h

@@ -24,8 +24,10 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
 }
 }
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockALCDataLoadingView : public IALCDataLoadingView {
   // XXX: A workaround, needed because of the way the comma is treated in a
@@ -368,6 +370,8 @@ public:
   }
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 
 #endif /* MANTID_CUSTOMINTERFACES_ALCDATALOADINGTEST_H_ */

MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h

@@ -5,8 +5,10 @@
 
 #include <gmock/gmock.h>
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 // This is a simple mock for the tomo interface view when using SCARF.
 class MockEnggDiffractionView
@@ -238,5 +240,8 @@ public:
   // virtual void plotCalibOutput();
   MOCK_METHOD1(plotCalibOutput, void(const std::string &pyCode));
 };
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
+
 #endif // MANTID_CUSTOMINTERFACES_ENGGDIFFRACTIONVIEWMOCK_H

MantidQt/CustomInterfaces/test/ImageROIViewMock.h

@@ -5,8 +5,10 @@
 
 #include <gmock/gmock.h>
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockImageROIView : public MantidQt::CustomInterfaces::IImageROIView {
 public:
@@ -107,6 +109,8 @@ public:
   MOCK_METHOD0(resetWidgetsOnNewStack, void());
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 
 #endif // MANTID_CUSTOMINTERFACES_IMAGEROIVIEWMOCK_H

MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h

@@ -11,8 +11,10 @@
 using namespace MantidQt::CustomInterfaces;
 using namespace Mantid::API;
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockView : public ReflMainView {
 public:
@@ -88,5 +90,9 @@ public:
   MOCK_CONST_METHOD1(transformArchivePath, std::string(const std::string &));
   ~MockICatalogInfo() override {}
 };
+
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
+
 #endif /*MANTID_CUSTOMINTERFACES_REFLMAINVIEWMOCKOBJECTS_H*/

MantidQt/CustomInterfaces/test/TomographyViewMock.h

@@ -5,8 +5,10 @@
 
 #include <gmock/gmock.h>
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 // This is a simple mock for the tomo interface view when using SCARF.
 class MockTomographyIfaceView
@@ -135,5 +137,9 @@ public:
   // virtual void runAggregateBands(Mantid::API::IAlgorithm_sptr alg)
   MOCK_METHOD1(runAggregateBands, void(Mantid::API::IAlgorithm_sptr alg));
 };
+
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
+
 #endif // MANTID_CUSTOMINTERFACES_TOMOGRAPHYIFACEVIEWMOCK_H

MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorMockObjects.h

@@ -21,8 +21,10 @@ const int ScaleCol = 6;
 const int GroupCol = 7;
 const int OptionsCol = 8;
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockDataProcessorView : public DataProcessorView {
 public:
@@ -113,5 +115,8 @@ private:
   std::map<std::string, QVariant> m_options;
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
+
 #endif /*MANTID_MANTIDWIDGETS_DATAPROCESSORVIEWMOCKOBJECTS_H*/

MantidQt/SliceViewer/test/MockObjects.h

@@ -23,8 +23,10 @@ using namespace Mantid::Geometry;
 using namespace Mantid;
 using boost::regex;
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 namespace {
 /*------------------------------------------------------------
@@ -250,4 +252,8 @@ public:
 };
 }
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
+#pragma GCC diagnostic pop
+#endif
+
 #endif

Vates/VatesAPI/test/MockObjects.h

@@ -73,9 +73,10 @@ public:
   ~FakeIMDDimension() override {}
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
-
+#endif
 //=================================================================================================
 /// Concrete mocked implementation of IMDWorkspace for testing.
 class MockIMDWorkspace : public Mantid::API::IMDWorkspace {
@@ -180,7 +181,9 @@ public:
   MOCK_METHOD1(eventRaised, void(double));
 };
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
+#endif
 
 class FakeProgressAction : public Mantid::VATES::ProgressAction {
   void eventRaised(double) override {}

Vates/VatesAPI/test/vtkPeakMarkerFactoryTest.h

@@ -23,8 +23,10 @@ using namespace ::testing;
 using namespace Mantid::VATES;
 using Mantid::VATES::vtkPeakMarkerFactory;
 
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 
 class MockPeakShape : public Peak {
 public:
@@ -313,5 +315,8 @@ public:
     }
   }
 };
+#if defined(GCC_VERSION) && GCC_VERSION >= 50000
 #pragma GCC diagnostic pop
 #endif
+
+#endif