diff --git a/Framework/API/test/FunctionParameterDecoratorTest.h b/Framework/API/test/FunctionParameterDecoratorTest.h
index aaaa04dea734691f49f387feb0df589f86eb6c26..c5a2c508da31f8e513c7efe745973953bb087adb 100644
--- a/Framework/API/test/FunctionParameterDecoratorTest.h
+++ b/Framework/API/test/FunctionParameterDecoratorTest.h
@@ -443,9 +443,9 @@ private:
class MockTestableFunctionParameterDecorator
: public TestableFunctionParameterDecorator {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(beforeDecoratedFunctionSet, void(const IFunction_sptr &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/API/test/ILatticeFunctionTest.h b/Framework/API/test/ILatticeFunctionTest.h
index ba66cf38f8a738d1a245bdf977389d984f8e9899..a64dc65bd213314393182ea7620a5a986d7a421e 100644
--- a/Framework/API/test/ILatticeFunctionTest.h
+++ b/Framework/API/test/ILatticeFunctionTest.h
@@ -73,7 +73,7 @@ public:
private:
std::vector<V3D> getTestHKLs() { return {{1, 1, 0}}; }
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
// Mock function to check whether the correct methods are called
class MockLatticeFunction : public ILatticeFunction {
public:
@@ -104,6 +104,6 @@ private:
};
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /* MANTID_API_ILATTICEFUNCTIONTEST_H_ */
diff --git a/Framework/API/test/ImplicitFunctionFactoryTest.h b/Framework/API/test/ImplicitFunctionFactoryTest.h
index 36efc10b6d335bc7c64e3bc12f610179d71b9ee1..30b1acfa60e63d7ca1869cd48503c07badf99827 100644
--- a/Framework/API/test/ImplicitFunctionFactoryTest.h
+++ b/Framework/API/test/ImplicitFunctionFactoryTest.h
@@ -16,7 +16,7 @@
#include <memory>
#include <vector>
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class ImplicitFunctionFactoryTest : public CxxTest::TestSuite {
private:
@@ -107,7 +107,7 @@ private:
MOCK_METHOD1(setSuccessorParser,
void(Mantid::API::ImplicitFunctionParameterParser *successor));
};
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
class MockImplicitFunctionBuilderA
: public Mantid::API::ImplicitFunctionBuilder {
diff --git a/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h b/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
index 2498543082a320b7d9b0d71c73cf00707684cce3..86b2f1f05b52eeb27076a2bd17301d25443c3a2c 100644
--- a/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
+++ b/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
@@ -17,11 +17,11 @@ private:
class MockImplicitFunctionParameter
: public Mantid::API::ImplicitFunctionParameter {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getName, std::string());
MOCK_CONST_METHOD0(isValid, bool());
MOCK_CONST_METHOD0(toXMLString, std::string());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
protected:
ImplicitFunctionParameter *clone() const override {
return new MockImplicitFunctionParameter;
diff --git a/Framework/API/test/LiveListenerTest.h b/Framework/API/test/LiveListenerTest.h
index e666b76a06282551f6bc64262b0a43b2daae6803..f26d77e8c48d01072723e76078a695c9170ac3be 100644
--- a/Framework/API/test/LiveListenerTest.h
+++ b/Framework/API/test/LiveListenerTest.h
@@ -14,7 +14,7 @@ public:
// Set this flag to true for testing
m_dataReset = true;
}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(name, std::string());
MOCK_CONST_METHOD0(supportsHistory, bool());
MOCK_CONST_METHOD0(buffersEvents, bool());
@@ -25,7 +25,7 @@ public:
MOCK_METHOD0(runStatus, RunStatus());
MOCK_CONST_METHOD0(runNumber, int());
MOCK_METHOD1(setAlgorithm, void(const Mantid::API::IAlgorithm &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
class LiveListenerTest : public CxxTest::TestSuite {
diff --git a/Framework/API/test/ModeratorModelTest.h b/Framework/API/test/ModeratorModelTest.h
index 3796f487eafb2175e38aabcbf6f3810caf00e0b3..1ae863636e82806dedcf053cba621f1532f9368b 100644
--- a/Framework/API/test/ModeratorModelTest.h
+++ b/Framework/API/test/ModeratorModelTest.h
@@ -13,13 +13,13 @@ public:
boost::shared_ptr<ModeratorModel> clone() const override {
return boost::shared_ptr<MockModerator>();
}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(emissionTimeMean, double());
MOCK_CONST_METHOD0(emissionTimeVariance, double());
MOCK_CONST_METHOD1(sampleTimeDistribution, double(const double));
MOCK_METHOD2(setParameterValue,
void(const std::string &, const std::string &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
class ModeratorModelTest : public CxxTest::TestSuite {
diff --git a/Framework/API/test/WorkspaceFactoryTest.h b/Framework/API/test/WorkspaceFactoryTest.h
index b10fd94b4742db9c7c14c42370a82b558a35bf84..5874d0870cbe35be400565ec9ebe4e9800fba9c8 100644
--- a/Framework/API/test/WorkspaceFactoryTest.h
+++ b/Framework/API/test/WorkspaceFactoryTest.h
@@ -9,6 +9,7 @@
#include "MantidAPI/Sample.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/FakeObjects.h"
using Mantid::MantidVec;
@@ -55,15 +56,13 @@ public:
MatrixWorkspace_sptr space;
TS_ASSERT_THROWS_NOTHING(
space = WorkspaceFactory::Instance().create("work", 1, 1, 1));
-// AppleClang gives warning if the result is unused.
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-value"
-#endif
+ // clang-format off
+ DIAG_OFF(unused-value)
+ // clang-format on
TS_ASSERT_THROWS_NOTHING(dynamic_cast<WorkspaceTester *>(space.get()));
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+ DIAG_ON(unused-value)
+ // clang-format on
}
/** Make a parent, have the child be created with the same sizes */
diff --git a/Framework/API/test/WorkspaceGroupTest.h b/Framework/API/test/WorkspaceGroupTest.h
index 9cffbe83d9ca782a1632ce7c21f1a9ffdd0a3b3f..2e42b865bbbe5209286de3d67d9f378bb68d8378 100644
--- a/Framework/API/test/WorkspaceGroupTest.h
+++ b/Framework/API/test/WorkspaceGroupTest.h
@@ -58,13 +58,13 @@ private:
// Helper type, representing some concrete workspace type.
class MockWorkspace : public Mantid::API::Workspace {
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(id, const std::string());
MOCK_CONST_METHOD0(name, const std::string());
MOCK_CONST_METHOD0(threadSafe, bool());
MOCK_CONST_METHOD0(toString, const std::string());
MOCK_CONST_METHOD0(getMemorySize, size_t());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
private:
MockWorkspace *doClone() const override {
throw std::runtime_error("Cloning of MockWorkspace is not implemented.");
diff --git a/Framework/Algorithms/test/MCAbsorptionStrategyTest.h b/Framework/Algorithms/test/MCAbsorptionStrategyTest.h
index 2c87197dfa9390e08183f1b4e76b43de84af6dd0..eda2cd82a2f7e8c5c9783276e65ee2b24829c84a 100644
--- a/Framework/Algorithms/test/MCAbsorptionStrategyTest.h
+++ b/Framework/Algorithms/test/MCAbsorptionStrategyTest.h
@@ -87,7 +87,7 @@ private:
class MockBeamProfile final : public Mantid::Algorithms::IBeamProfile {
public:
using Mantid::Algorithms::IBeamProfile::Ray;
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(generatePoint,
Ray(Mantid::Kernel::PseudoRandomNumberGenerator &));
MOCK_CONST_METHOD2(generatePoint,
@@ -95,7 +95,7 @@ private:
const Mantid::Geometry::BoundingBox &));
MOCK_CONST_METHOD1(defineActiveRegion, Mantid::Geometry::BoundingBox(
const Mantid::API::Sample &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h b/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h
index 395a84ceea3f58d0576bcc8ccfc8befd66eed9c8..49de83f36a365b644d959a33f102c1b7196d41c3 100644
--- a/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h
+++ b/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h
@@ -13,7 +13,7 @@ using namespace Mantid::Algorithms;
using namespace testing;
class MockEntropy : public MaxentEntropy {
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
public:
MOCK_METHOD2(derivative,
std::vector<double>(const std::vector<double> &, double));
@@ -29,7 +29,7 @@ public:
MOCK_METHOD1(imageToData, std::vector<double>(const std::vector<double> &));
MOCK_METHOD1(dataToImage, std::vector<double>(const std::vector<double> &));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
using MockEntropy_sptr = std::shared_ptr<MockEntropy>;
class MaxentCalculatorTest : public CxxTest::TestSuite {
diff --git a/Framework/Algorithms/test/MonteCarloTesting.h b/Framework/Algorithms/test/MonteCarloTesting.h
index 004e39f3b2c4e25139ae66a12e1593bddfc72f89..5fa56bf294e3ea2529a254c5192fad7f2cfd23d2 100644
--- a/Framework/Algorithms/test/MonteCarloTesting.h
+++ b/Framework/Algorithms/test/MonteCarloTesting.h
@@ -25,7 +25,7 @@ namespace MonteCarloTesting {
// -----------------------------------------------------------------------------
class MockRNG final : public Mantid::Kernel::PseudoRandomNumberGenerator {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(nextValue, double());
MOCK_METHOD2(nextValue, double(double, double));
MOCK_METHOD2(nextInt, int(int, int));
@@ -36,7 +36,7 @@ public:
MOCK_METHOD2(setRange, void(const double, const double));
MOCK_CONST_METHOD0(min, double());
MOCK_CONST_METHOD0(max, double());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
// -----------------------------------------------------------------------------
diff --git a/Framework/Algorithms/test/RebinByTimeBaseTest.h b/Framework/Algorithms/test/RebinByTimeBaseTest.h
index 1f3f4ab0f1fd93c9a9654f592d14e13373e83f43..f78858b0ca8cd80a536e49f14838de3569fd8483 100644
--- a/Framework/Algorithms/test/RebinByTimeBaseTest.h
+++ b/Framework/Algorithms/test/RebinByTimeBaseTest.h
@@ -72,7 +72,7 @@ createEventWorkspace(const int numberspectra, const int nDistrubutedEvents,
return retVal;
}
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
/*
This type is an IEventWorkspace, but not an EventWorkspace.
@@ -115,7 +115,7 @@ private:
};
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
//=====================================================================================
// Functional Tests
diff --git a/Framework/Crystal/test/FindSXPeaksHelperTest.h b/Framework/Crystal/test/FindSXPeaksHelperTest.h
index 2838b2a231f85b3af6db25cdeb04b90391f01987..41d5291204f963958015edc9de876c406a114d14 100644
--- a/Framework/Crystal/test/FindSXPeaksHelperTest.h
+++ b/Framework/Crystal/test/FindSXPeaksHelperTest.h
@@ -16,14 +16,14 @@ using namespace testing;
namespace {
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockProgressBase : public Mantid::Kernel::ProgressBase {
public:
MOCK_METHOD1(doReport, void(const std::string &));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
}
class FindSXPeaksHelperTest : public CxxTest::TestSuite {
diff --git a/Framework/Crystal/test/MockObjects.h b/Framework/Crystal/test/MockObjects.h
index 2ab37abf457102e40c7b405a297ebac14401e7ad..d47b97a1b6974c9e51d8808297457b1e3c813c34 100644
--- a/Framework/Crystal/test/MockObjects.h
+++ b/Framework/Crystal/test/MockObjects.h
@@ -17,7 +17,7 @@
namespace Mantid {
namespace Crystal {
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
// Mock Background strategy
class MockBackgroundStrategy : public BackgroundStrategy {
@@ -49,7 +49,7 @@ public:
}
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
}
}
diff --git a/Framework/Crystal/test/PeakBackgroundTest.h b/Framework/Crystal/test/PeakBackgroundTest.h
index 4605bc1606738d9a813cc12304c531a78893c931..2f74c5255224a27b16e325f22f852c639b626912 100644
--- a/Framework/Crystal/test/PeakBackgroundTest.h
+++ b/Framework/Crystal/test/PeakBackgroundTest.h
@@ -33,7 +33,7 @@ IPeaksWorkspace_sptr make_peaks_workspace(const V3D &hklPeak) {
return peakWS;
}
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
// Mock Background strategy
class MockIMDIterator : public IMDIterator {
@@ -68,7 +68,7 @@ public:
MOCK_CONST_METHOD1(isWithinBounds, bool(size_t));
};
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class PeakBackgroundTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/CurveFitting/src/Functions/CrystalElectricField.cpp b/Framework/CurveFitting/src/Functions/CrystalElectricField.cpp
index 783d4f2f5d17a4267e66361a3979384fed83999a..d0dddaa4baeb77bb173e3fedea9a859403f5f283 100644
--- a/Framework/CurveFitting/src/Functions/CrystalElectricField.cpp
+++ b/Framework/CurveFitting/src/Functions/CrystalElectricField.cpp
@@ -2,6 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidCurveFitting/Functions/CrystalElectricField.h"
+#include "MantidKernel/WarningSuppressions.h"
#include <algorithm>
#include <array>
@@ -14,12 +15,11 @@ namespace Functions {
namespace {
-#ifdef __clang__
// The missing braces warning is a false positive -
// https://llvm.org/bugs/show_bug.cgi?id=21629
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmissing-braces"
-#endif
+// clang-format off
+DIAG_OFF(missing-braces)
+// clang-format on
// Get a complex conjugate of the value returned by
// ComplexMatrix::operator(i,j)
@@ -636,9 +636,9 @@ void diagonalise(const ComplexFortranMatrix &hamiltonian,
eigenvalues += -eshift;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_OFF(missing-braces)
+// clang-format on
} // anonymous namespace
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc
index d5ab8608c215b005c2b4af2ce63126b84f3d7a30..9e77d006f89686631e155586592dbc36195c7673 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.tcc
@@ -1287,7 +1287,7 @@ TMDE(void MDGridBox)::centroidSphere(API::CoordTransform &radiusTransform,
}
//-----------------------------------------------------------------------------------------------
// clang-format off
-GCC_DIAG_OFF(array-bounds)
+DIAG_OFF(array-bounds)
// clang-format on
/** Integrate the signal within a sphere; for example, to perform single-crystal
* peak integration.
@@ -1493,7 +1493,7 @@ TMDE(void MDGridBox)::integrateCylinder(
delete[] boxMightTouch;
}
// clang-format off
-GCC_DIAG_ON(array-bounds)
+DIAG_ON(array-bounds)
// clang-format on
/**
diff --git a/Framework/DataObjects/src/MDHistoWorkspace.cpp b/Framework/DataObjects/src/MDHistoWorkspace.cpp
index d93a75a35536329e5dcba2abe0abe0dcf270616d..e760c6f1c1f6f1e0586d851770612cf5ef01094e 100644
--- a/Framework/DataObjects/src/MDHistoWorkspace.cpp
+++ b/Framework/DataObjects/src/MDHistoWorkspace.cpp
@@ -1347,7 +1347,7 @@ uint64_t MDHistoWorkspace::sumNContribEvents() const {
* Get the Q frame system (if any) to use.
*/
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
Kernel::SpecialCoordinateSystem
MDHistoWorkspace::getSpecialCoordinateSystem() const {
diff --git a/Framework/DataObjects/test/MDBoxIteratorTest.h b/Framework/DataObjects/test/MDBoxIteratorTest.h
index 93fc5a6f58966a92d18a7796658c7388fcb74db9..0a0bb76b2879779985bf26e6fec18ea54dfbd4c5 100644
--- a/Framework/DataObjects/test/MDBoxIteratorTest.h
+++ b/Framework/DataObjects/test/MDBoxIteratorTest.h
@@ -492,9 +492,9 @@ public:
pBC(MDBox<MDLeanEvent<2>, 2>::getBoxController())
{}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getIsMasked, bool());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
~MockMDBox() override { delete pBC; }
};
@@ -570,10 +570,10 @@ public:
/// Mock Skipping Policy Type to inject.
class MockSkippingPolicy : public SkippingPolicy {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(keepGoing, bool());
MOCK_METHOD0(Die, void());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
~MockSkippingPolicy() override { Die(); }
};
diff --git a/Framework/DataObjects/test/MDGridBoxTest.h b/Framework/DataObjects/test/MDGridBoxTest.h
index 5f35b0ddba6504df986c145a2a48e03fe1962e7b..341b1c301cc613c65eb1c888317b158f7c142386 100644
--- a/Framework/DataObjects/test/MDGridBoxTest.h
+++ b/Framework/DataObjects/test/MDGridBoxTest.h
@@ -47,12 +47,12 @@ private:
MockMDBox()
: MDBox<MDLeanEvent<1>, 1>(new API::BoxController(1)),
pBC(MDBox<MDLeanEvent<1>, 1>::getBoxController()) {}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getIsMasked, bool());
MOCK_METHOD0(mask, void());
MOCK_METHOD0(unmask, void());
~MockMDBox() override { delete pBC; }
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
// the sp to a box controller used as general reference to all tested
diff --git a/Framework/DataObjects/test/MockObjects.h b/Framework/DataObjects/test/MockObjects.h
index 9e271ecd35fe7bf49ac988d37e20025151b92c0d..d1f7b2ec458bc96846e2b9f875b667dedcaab9f8 100644
--- a/Framework/DataObjects/test/MockObjects.h
+++ b/Framework/DataObjects/test/MockObjects.h
@@ -10,7 +10,7 @@
namespace Mantid {
namespace DataObjects {
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockPeakShapeFactory : public PeakShapeFactory {
public:
@@ -37,6 +37,6 @@ public:
}
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /* MOCKOBJECTS_H_ */
diff --git a/Framework/Geometry/src/Objects/RuleItems.cpp b/Framework/Geometry/src/Objects/RuleItems.cpp
index f23833f83890a5658a4ab0b8ad38f4628d153de1..fd64337e51017df2f924a693181a4dc376f9b520 100644
--- a/Framework/Geometry/src/Objects/RuleItems.cpp
+++ b/Framework/Geometry/src/Objects/RuleItems.cpp
@@ -34,17 +34,17 @@
#endif
#include "MantidKernel/WarningSuppressions.h"
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <TopoDS_Shape.hxx>
#include <BRepAlgoAPI_Common.hxx>
#include <BRepAlgoAPI_Fuse.hxx>
#include <BRepPrimAPI_MakeBox.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#endif
diff --git a/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp b/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp
index ec15829f2b8bf75a7cd2667fa788822722b991cc..7ba3e7d1e4552c5a699fd75c3cda5e9e0ac12672 100644
--- a/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp
+++ b/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp
@@ -23,9 +23,9 @@
#endif
#endif
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <gp_Trsf.hxx>
#include <gp_Pnt.hxx>
@@ -39,9 +39,9 @@ GCC_DIAG_OFF(cast-qual)
#include <BRepBuilderAPI_Transform.hxx>
#include <BRep_Tool.hxx>
#include <Poly_Triangulation.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#ifdef __INTEL_COMPILER
diff --git a/Framework/Geometry/src/Rendering/RenderingHelpers.cpp b/Framework/Geometry/src/Rendering/RenderingHelpers.cpp
index af230c87276a01f61b3969d0b32097b240b5b1b5..76e17374af56cd8bf95307554535d6dce0266b16 100644
--- a/Framework/Geometry/src/Rendering/RenderingHelpers.cpp
+++ b/Framework/Geometry/src/Rendering/RenderingHelpers.cpp
@@ -28,9 +28,9 @@
#endif
#endif
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <gp_Pnt.hxx>
#include <TopoDS.hxx>
@@ -41,9 +41,9 @@ GCC_DIAG_OFF(cast-qual)
#include <Poly_Array1OfTriangle.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <Poly_Triangulation.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#ifdef __INTEL_COMPILER
diff --git a/Framework/Geometry/src/Surfaces/Cone.cpp b/Framework/Geometry/src/Surfaces/Cone.cpp
index 6414902e4bf937e205b2adb41a2d9427d8d6c936..111420ccd022130006d8d5118ca9c6af6be1133c 100644
--- a/Framework/Geometry/src/Surfaces/Cone.cpp
+++ b/Framework/Geometry/src/Surfaces/Cone.cpp
@@ -30,14 +30,14 @@
#endif
#include "MantidKernel/WarningSuppressions.h"
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <BRepPrimAPI_MakeCone.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#endif
diff --git a/Framework/Geometry/src/Surfaces/Cylinder.cpp b/Framework/Geometry/src/Surfaces/Cylinder.cpp
index ee1d6fba81ec2005ec212391e69a2847dccfe22b..d4af5cac27a05990e137b8963c177e4c6f7162be 100644
--- a/Framework/Geometry/src/Surfaces/Cylinder.cpp
+++ b/Framework/Geometry/src/Surfaces/Cylinder.cpp
@@ -16,14 +16,14 @@
#endif
#include "MantidKernel/WarningSuppressions.h"
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <BRepPrimAPI_MakeCylinder.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#endif
diff --git a/Framework/Geometry/src/Surfaces/Plane.cpp b/Framework/Geometry/src/Surfaces/Plane.cpp
index 5bf951c2b1bc0b9891412373d27526ceae78f0d5..1a84602898ac0b0282743bfd035a8d9f14284ee4 100644
--- a/Framework/Geometry/src/Surfaces/Plane.cpp
+++ b/Framework/Geometry/src/Surfaces/Plane.cpp
@@ -17,18 +17,18 @@
#endif
#include "MantidKernel/WarningSuppressions.h"
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <BRepPrimAPI_MakeBox.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepPrimAPI_MakeHalfSpace.hxx>
#include <BRepAlgoAPI_Common.hxx>
#include <gp_Pln.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#endif
diff --git a/Framework/Geometry/src/Surfaces/Sphere.cpp b/Framework/Geometry/src/Surfaces/Sphere.cpp
index 750d20ae14a5b94e8a50217c6705cf7a412a09a2..315f3a6881c20a80d3299cd13f356948387e473f 100644
--- a/Framework/Geometry/src/Surfaces/Sphere.cpp
+++ b/Framework/Geometry/src/Surfaces/Sphere.cpp
@@ -14,14 +14,14 @@
#endif
#include "MantidKernel/WarningSuppressions.h"
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <BRepPrimAPI_MakeSphere.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#endif
diff --git a/Framework/Geometry/src/Surfaces/Surface.cpp b/Framework/Geometry/src/Surfaces/Surface.cpp
index b5610a3ffd8db7c516854660598d1d66e06a2825..a2b436e85e90ff5436b0782725420bb7c758ebb6 100644
--- a/Framework/Geometry/src/Surfaces/Surface.cpp
+++ b/Framework/Geometry/src/Surfaces/Surface.cpp
@@ -29,14 +29,14 @@
#endif
#include "MantidKernel/WarningSuppressions.h"
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <TopoDS_Shape.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#endif
diff --git a/Framework/Geometry/src/Surfaces/Torus.cpp b/Framework/Geometry/src/Surfaces/Torus.cpp
index f537c08e25bad97d2dfa899916e4888fe4acb322..44025b8c3239e972a19f56c06cf7cdbbc81d8a06 100644
--- a/Framework/Geometry/src/Surfaces/Torus.cpp
+++ b/Framework/Geometry/src/Surfaces/Torus.cpp
@@ -29,14 +29,14 @@
#endif
#include "MantidKernel/WarningSuppressions.h"
-GCC_DIAG_OFF(conversion)
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(cast-qual)
// clang-format on
#include <TopoDS_Shape.hxx>
-GCC_DIAG_ON(conversion)
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(conversion)
+DIAG_ON(cast-qual)
// clang-format on
#endif
diff --git a/Framework/Geometry/test/BasicHKLFiltersTest.h b/Framework/Geometry/test/BasicHKLFiltersTest.h
index ead68b6fa11bcc13cbdfdeecf804db12515f44a5..3b5a550e70ae92d818123078d0e943b28e59bd3c 100644
--- a/Framework/Geometry/test/BasicHKLFiltersTest.h
+++ b/Framework/Geometry/test/BasicHKLFiltersTest.h
@@ -136,7 +136,7 @@ public:
TS_ASSERT(Mock::VerifyAndClearExpectations(mock.get()))
}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
private:
class MockStructureFactorCalculator : public StructureFactorCalculator {
public:
@@ -144,5 +144,5 @@ private:
MOCK_CONST_METHOD1(getFSquared, double(const V3D &));
};
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /* MANTID_GEOMETRY_BASICHKLFILTERSTEST_H_ */
diff --git a/Framework/Geometry/test/BraggScattererFactoryTest.h b/Framework/Geometry/test/BraggScattererFactoryTest.h
index 34737190befadf5e28955bc69843b127f8746859..2586d2f8fd8df159588652388c7e810801cb51f2 100644
--- a/Framework/Geometry/test/BraggScattererFactoryTest.h
+++ b/Framework/Geometry/test/BraggScattererFactoryTest.h
@@ -56,10 +56,10 @@ private:
~MockScatterer() override {}
std::string name() const override { return "MockScatterer"; }
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(clone, BraggScatterer_sptr());
MOCK_CONST_METHOD1(calculateStructureFactor, StructureFactor(const V3D &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h b/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
index e39b4093bc9eac1674c38f0d9e74080e32d369be..28147bf85b77504fd6a998152037512ca89d0c8d 100644
--- a/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
+++ b/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
@@ -112,12 +112,12 @@ private:
public:
MockBraggScatterer() : BraggScattererInCrystalStructure() {}
~MockBraggScatterer() override {}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(name, std::string());
MOCK_CONST_METHOD0(clone, BraggScatterer_sptr());
MOCK_CONST_METHOD1(calculateStructureFactor, StructureFactor(const V3D &));
MOCK_METHOD1(afterScattererPropertySet, void(const std::string &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/BraggScattererTest.h b/Framework/Geometry/test/BraggScattererTest.h
index b3e80316e10d73686709ec6f46222bcee7ef67ca..f2b52ce9177b538cc72288fa9348425ca25da1f0 100644
--- a/Framework/Geometry/test/BraggScattererTest.h
+++ b/Framework/Geometry/test/BraggScattererTest.h
@@ -43,12 +43,12 @@ private:
class MockBraggScatterer : public BraggScatterer {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(name, std::string());
MOCK_CONST_METHOD0(clone, BraggScatterer_sptr());
MOCK_CONST_METHOD1(calculateStructureFactor, StructureFactor(const V3D &));
MOCK_METHOD1(afterScattererPropertySet, void(const std::string &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/CSGObjectTest.h b/Framework/Geometry/test/CSGObjectTest.h
index 0c9f7bb10e417971079e96b04819fca94ea61924..0f7db17dcdd275ae95c717e4506a7a8303f422e9 100644
--- a/Framework/Geometry/test/CSGObjectTest.h
+++ b/Framework/Geometry/test/CSGObjectTest.h
@@ -45,7 +45,7 @@ namespace {
// -----------------------------------------------------------------------------
class MockRNG final : public Mantid::Kernel::PseudoRandomNumberGenerator {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(nextValue, double());
MOCK_METHOD2(nextValue, double(double, double));
MOCK_METHOD2(nextInt, int(int, int));
@@ -56,7 +56,7 @@ public:
MOCK_METHOD2(setRange, void(const double, const double));
MOCK_CONST_METHOD0(min, double());
MOCK_CONST_METHOD0(max, double());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
}
diff --git a/Framework/Geometry/test/CompositeImplicitFunctionTest.h b/Framework/Geometry/test/CompositeImplicitFunctionTest.h
index f6861a2047f2c7bb060e2b1c6014d91cc32f5003..5ddd3d87ef36f5b291b6b3c4237e995161b1f454 100644
--- a/Framework/Geometry/test/CompositeImplicitFunctionTest.h
+++ b/Framework/Geometry/test/CompositeImplicitFunctionTest.h
@@ -18,11 +18,11 @@ private:
// composite.
class MockImplicitFunction : public Mantid::Geometry::MDImplicitFunction {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(toXMLString, std::string());
MOCK_CONST_METHOD0(getName, std::string());
MOCK_METHOD1(isPointContained, bool(const Mantid::coord_t *coords));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
bool isPointContained(const std::vector<Mantid::coord_t> &) override {
return true;
}
diff --git a/Framework/Geometry/test/GroupTest.h b/Framework/Geometry/test/GroupTest.h
index b67088ec47c39f9cb49ed0ad018cee0d56b87aef..c2a16693b781a55fbf6b19695984133fd38302f8 100644
--- a/Framework/Geometry/test/GroupTest.h
+++ b/Framework/Geometry/test/GroupTest.h
@@ -3,10 +3,11 @@
#include <cxxtest/TestSuite.h>
-#include "MantidKernel/V3D.h"
#include "MantidGeometry/Crystal/Group.h"
#include "MantidGeometry/Crystal/SymmetryOperationFactory.h"
#include "MantidGeometry/Crystal/UnitCell.h"
+#include "MantidKernel/V3D.h"
+#include "MantidKernel/WarningSuppressions.h"
#include <boost/make_shared.hpp>
using namespace Mantid::Geometry;
@@ -367,16 +368,15 @@ public:
Group_const_sptr null;
TS_ASSERT_THROWS(null * null, std::invalid_argument);
-// AppleClang gives a warning if we don't use the result
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-comparison"
-#endif
+ // clang gives a warning if we don't use the result
+ // clang-format off
+ DIAG_OFF(unused-comparison)
+ // clang-format on
TS_ASSERT_THROWS(null == null, std::invalid_argument);
TS_ASSERT_THROWS(null != null, std::invalid_argument);
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+ DIAG_ON(unused-comparison)
+ // clang-format on
TS_ASSERT_THROWS(three * null, std::invalid_argument);
TS_ASSERT_THROWS(null * three, std::invalid_argument);
diff --git a/Framework/Geometry/test/HKLFilterTest.h b/Framework/Geometry/test/HKLFilterTest.h
index 08f8bbd89a75a2edef341c5b580b9ed372e6b41c..d73a4cabe7875326a6d005ef72a256a7986170d1 100644
--- a/Framework/Geometry/test/HKLFilterTest.h
+++ b/Framework/Geometry/test/HKLFilterTest.h
@@ -184,7 +184,7 @@ public:
TS_ASSERT_EQUALS(orFilterCasted->getLHS(), lhs);
TS_ASSERT_EQUALS(orFilterCasted->getRHS(), rhs);
}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
private:
class MockHKLFilter : public HKLFilter {
public:
@@ -212,5 +212,5 @@ private:
MOCK_CONST_METHOD1(isAllowed, bool(const V3D &));
};
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /* MANTID_GEOMETRY_HKLFILTERTEST_H_ */
diff --git a/Framework/Geometry/test/InstrumentDefinitionParserTest.h b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
index ea47421b1f6a457f5525f0afa44f86f278406007..f5ccd58a921b66a11478035ad59c61680e0a05a5 100644
--- a/Framework/Geometry/test/InstrumentDefinitionParserTest.h
+++ b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
@@ -22,7 +22,7 @@ using namespace testing;
using ScopedFileHelper::ScopedFile;
class InstrumentDefinitionParserTest : public CxxTest::TestSuite {
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
private:
/// Mock Type to act as IDF files.
class MockIDFObject : public Mantid::Geometry::IDFObject {
@@ -40,7 +40,7 @@ private:
MOCK_CONST_METHOD0(exists, bool());
MOCK_CONST_METHOD0(getParentDirectory, const Poco::Path());
};
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
/**
Helper type to pass around related IDF environment information in a
collection.
diff --git a/Framework/Geometry/test/MDGeometryXMLBuilderTest.h b/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
index 0e8c66ac87761082a89547f07fb4400f1e3df1e6..86d9b8c26ebbf23d489156e7e461486a5b10030e 100644
--- a/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
+++ b/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
@@ -34,7 +34,7 @@ private:
/// dependency.
class MockIMDDimension : public Mantid::Geometry::IMDDimension {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getName, std::string());
MOCK_CONST_METHOD0(getUnits, const Mantid::Kernel::UnitLabel());
MOCK_CONST_METHOD0(getDimensionId, const std::string &());
@@ -48,7 +48,7 @@ private:
MOCK_METHOD3(setRange, void(size_t nBins, coord_t min, coord_t max));
MOCK_CONST_METHOD0(getMDUnits, const Kernel::MDUnit &());
MOCK_CONST_METHOD0(getMDFrame, const Geometry::MDFrame &());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
static std::string createDimensionXMLString(unsigned int nbins, int min,
diff --git a/Framework/Geometry/test/MeshObjectTest.h b/Framework/Geometry/test/MeshObjectTest.h
index 15ba9a18e277ae2485622237fd22e3bf08489b5d..2115f7de14bbbef97f985d568bf07b08584fc2a4 100644
--- a/Framework/Geometry/test/MeshObjectTest.h
+++ b/Framework/Geometry/test/MeshObjectTest.h
@@ -37,7 +37,7 @@ namespace {
// -----------------------------------------------------------------------------
class MockRNG final : public Mantid::Kernel::PseudoRandomNumberGenerator {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(nextValue, double());
MOCK_METHOD2(nextValue, double(double, double));
MOCK_METHOD2(nextInt, int(int, int));
@@ -48,7 +48,7 @@ public:
MOCK_METHOD2(setRange, void(const double, const double));
MOCK_CONST_METHOD0(min, double());
MOCK_CONST_METHOD0(max, double());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
std::unique_ptr<MeshObject> createCube(const double size, const V3D ¢re) {
diff --git a/Framework/Geometry/test/MockObjects.h b/Framework/Geometry/test/MockObjects.h
index 168b8db8a002d858eba0ece05e8270c6e9105826..5635147723c43e6751ca14fe00e28765f2ba33fb 100644
--- a/Framework/Geometry/test/MockObjects.h
+++ b/Framework/Geometry/test/MockObjects.h
@@ -23,7 +23,7 @@ using boost::regex;
namespace {
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
/*------------------------------------------------------------
Mock Peak Transform
@@ -121,5 +121,5 @@ public:
MOCK_CONST_METHOD0(getPeakShape, const Mantid::Geometry::PeakShape &());
};
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /* MANTIDGEOMETRYTEST_MOCKOBJECTS_H_ */
diff --git a/Framework/Geometry/test/PeakTransformSelectorTest.h b/Framework/Geometry/test/PeakTransformSelectorTest.h
index ac3c438324c0cef5912b47b4190c73558a99c5d9..cef3d4ee33810dc53fdacdce80885eed1d11cdc4 100644
--- a/Framework/Geometry/test/PeakTransformSelectorTest.h
+++ b/Framework/Geometry/test/PeakTransformSelectorTest.h
@@ -23,12 +23,12 @@ private:
enum { value = I };
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(createDefaultTransform, PeakTransform_sptr());
MOCK_CONST_METHOD2(createTransform,
PeakTransform_sptr(const std::string &,
const std::string &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
using MockPeakTransformFactory = MockPeakTransformFactoryType<0>;
diff --git a/Framework/Geometry/test/SampleEnvironmentTest.h b/Framework/Geometry/test/SampleEnvironmentTest.h
index 2890c717f08659ef0ff3d7c55ac8a7df158c601a..aa4f0922f1f3d7f6a188ed1ed55c794d6c7519fc 100644
--- a/Framework/Geometry/test/SampleEnvironmentTest.h
+++ b/Framework/Geometry/test/SampleEnvironmentTest.h
@@ -21,7 +21,7 @@ namespace {
// -----------------------------------------------------------------------------
class MockRNG final : public Mantid::Kernel::PseudoRandomNumberGenerator {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(nextValue, double());
MOCK_METHOD2(nextValue, double(double, double));
MOCK_METHOD2(nextInt, int(int, int));
@@ -32,7 +32,7 @@ public:
MOCK_METHOD2(setRange, void(const double, const double));
MOCK_CONST_METHOD0(min, double());
MOCK_CONST_METHOD0(max, double());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
}
diff --git a/Framework/Geometry/test/SpaceGroupFactoryTest.h b/Framework/Geometry/test/SpaceGroupFactoryTest.h
index 47bf1c43250173ec5430558084d7b0678d7e9830..a4e5974ddeab878ff119547082b446f07bc18b6c 100644
--- a/Framework/Geometry/test/SpaceGroupFactoryTest.h
+++ b/Framework/Geometry/test/SpaceGroupFactoryTest.h
@@ -398,9 +398,9 @@ private:
MockSpaceGroupGenerator(size_t number, const std::string &hmSymbol,
const std::string &generatorInformation)
: AbstractSpaceGroupGenerator(number, hmSymbol, generatorInformation) {}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(generateGroup, Group_const_sptr());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
/* Testing TransformationSpaceGroupGenerator is a bit hard in the sense that
diff --git a/Framework/Geometry/test/StructureFactorCalculatorTest.h b/Framework/Geometry/test/StructureFactorCalculatorTest.h
index 07f26d2044b8d83e2c169fe8723ba626996c9b45..225a1a9eb3db12340bc6cca616b69217617acf8c 100644
--- a/Framework/Geometry/test/StructureFactorCalculatorTest.h
+++ b/Framework/Geometry/test/StructureFactorCalculatorTest.h
@@ -99,11 +99,11 @@ private:
*/
class MockStructureFactorCalculator : public StructureFactorCalculator {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(getF, StructureFactor(const V3D &hkl));
MOCK_METHOD1(crystalStructureSetHook,
void(const CrystalStructure &crystalStructure));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/SymmetryElementFactoryTest.h b/Framework/Geometry/test/SymmetryElementFactoryTest.h
index 521bdb6e3aa6317c8712a996e50ac0fb24b3725b..d7e9c4d2f91e7c7cf148821e25ada10abbca1440 100644
--- a/Framework/Geometry/test/SymmetryElementFactoryTest.h
+++ b/Framework/Geometry/test/SymmetryElementFactoryTest.h
@@ -396,12 +396,12 @@ private:
class TestableSymmetryElementWithAxisGenerator
: public SymmetryElementWithAxisGenerator {
friend class SymmetryElementFactoryTest;
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(generateElement,
SymmetryElement_sptr(const SymmetryOperation &));
MOCK_CONST_METHOD1(canProcess, bool(const SymmetryOperation &));
MOCK_CONST_METHOD1(determineSymbol, std::string(const SymmetryOperation &));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
class TestableSymmetryElementRotationGenerator
diff --git a/Framework/Geometry/test/SymmetryElementTest.h b/Framework/Geometry/test/SymmetryElementTest.h
index a6dab9ede8d75054c13fc6ebc49768417bc87bee..7f3097507ee94e918e2f450c4beca595a2b2f863 100644
--- a/Framework/Geometry/test/SymmetryElementTest.h
+++ b/Framework/Geometry/test/SymmetryElementTest.h
@@ -159,7 +159,7 @@ public:
private:
class MockSymmetryElement : public SymmetryElement {
friend class SymmetryElementTest;
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
public:
MockSymmetryElement(const std::string &hmSymbol)
: SymmetryElement(hmSymbol) {}
@@ -175,7 +175,7 @@ private:
: SymmetryElementWithAxis(symbol, axis, translation) {}
MOCK_CONST_METHOD0(clone, SymmetryElement_sptr());
};
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
#endif /* MANTID_GEOMETRY_SYMMETRYELEMENTTEST_H_ */
diff --git a/Framework/ICat/src/CatalogSearch.cpp b/Framework/ICat/src/CatalogSearch.cpp
index be251804f99cc9f24be5af2d0fc79290716c69d9..ce89525405161acf4c0f7f6fa71bba0e44efed4c 100644
--- a/Framework/ICat/src/CatalogSearch.cpp
+++ b/Framework/ICat/src/CatalogSearch.cpp
@@ -1,12 +1,12 @@
#if GCC_VERSION >= 40800 // 4.8.0
// clang-format off
-GCC_DIAG_OFF(literal-suffix)
+DIAG_OFF(literal-suffix)
// clang-format on
#endif
#include "MantidICat/CatalogSearch.h"
#if GCC_VERSION >= 40800 // 4.8.0
// clang-format off
-GCC_DIAG_ON(literal-suffix)
+DIAG_ON(literal-suffix)
// clang-format on
#endif
diff --git a/Framework/ICat/src/GSoap.cpp b/Framework/ICat/src/GSoap.cpp
index d0c2ea6339a65b395a4d8f939e85ffd0442a61ec..f4c23869b1e716fa8077ab0220372833b24754f7 100644
--- a/Framework/ICat/src/GSoap.cpp
+++ b/Framework/ICat/src/GSoap.cpp
@@ -5,16 +5,16 @@
// it is automatically generated code
//------------------------------------------------------------------------------
// clang-format off
-GCC_DIAG_OFF(cast-qual)
-GCC_DIAG_OFF(conversion)
-GCC_DIAG_OFF(unused-parameter)
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(unused-parameter)
+DIAG_OFF(strict-aliasing)
+DIAG_OFF(format)
+DIAG_OFF(vla)
// clang-format on
-GCC_DIAG_OFF(format)
-GCC_DIAG_OFF(vla)
#if GCC_VERSION >= 40800 // 4.8.0
// clang-format off
-GCC_DIAG_OFF(literal-suffix)
+DIAG_OFF(literal-suffix)
// clang-format on
#endif
#ifdef _WIN32
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index fc03059c4637bf0dacc9e982d79bc24d44fbf45f..3fef47ec183bf590b966f167b5436144f06be81a 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -1,19 +1,14 @@
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-align"
-#endif
#include "MantidKernel/WarningSuppressions.h"
// ignore warnings in gSOAP
// Long-term solution is to use gSOAP as an external library or external
// project. see issue #19433
// clang-format off
-#if defined(__GNUC__) && __GNUC__ >= 7
-GCC_DIAG_OFF(deprecated-declarations)
-GCC_DIAG_OFF(format-overflow)
-GCC_DIAG_OFF(format-truncation)
-GCC_DIAG_OFF(implicit-fallthrough)
-#endif
+DIAG_OFF(deprecated-declarations)
+DIAG_OFF(format-overflow)
+DIAG_OFF(format-truncation)
+DIAG_OFF(implicit-fallthrough)
+DIAG_OFF(cast-align)
// clang-format on
/*
@@ -17022,14 +17017,9 @@ soap::~soap() {
/******************************************************************************/
// clang-format off
-#if defined(__GNUC__) && __GNUC__ >= 7
-GCC_DIAG_ON(deprecated-declarations)
-GCC_DIAG_ON(format-overflow)
-GCC_DIAG_ON(format-truncation)
-GCC_DIAG_ON(implicit-fallthrough)
-#endif
+DIAG_ON(deprecated-declarations)
+DIAG_ON(format-overflow)
+DIAG_ON(format-truncation)
+DIAG_ON(implicit-fallthrough)
+DIAG_ON(cast-align)
// clang-format on
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
diff --git a/Framework/ICat/src/ICat3/ICat3GSoapGenerated.cpp b/Framework/ICat/src/ICat3/ICat3GSoapGenerated.cpp
index d1b54aeaaf706ddcc99d86080eb33de8a601eea4..0835075b17cd7d91046edfe875d6ad4e169a9dbe 100644
--- a/Framework/ICat/src/ICat3/ICat3GSoapGenerated.cpp
+++ b/Framework/ICat/src/ICat3/ICat3GSoapGenerated.cpp
@@ -5,16 +5,16 @@
// it is automatically generated code
//------------------------------------------------------------------------------
// clang-format off
-GCC_DIAG_OFF(cast-qual)
-GCC_DIAG_OFF(conversion)
-GCC_DIAG_OFF(unused-parameter)
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(unused-parameter)
+DIAG_OFF(strict-aliasing)
+DIAG_OFF(format)
+DIAG_OFF(vla)
// clang-format on
-GCC_DIAG_OFF(format)
-GCC_DIAG_OFF(vla)
#if GCC_VERSION >= 40800 // 4.8.0
// clang-format off
-GCC_DIAG_OFF(literal-suffix)
+DIAG_OFF(literal-suffix)
// clang-format on
#endif
#ifdef _WIN32
diff --git a/Framework/ICat/src/ICat3/ICat3Helper.cpp b/Framework/ICat/src/ICat3/ICat3Helper.cpp
index f613f2b30bee89f706f3ff36c39f1e8d039cc698..1b9c9a846affec0525580a703cc1a229c3bd8144 100644
--- a/Framework/ICat/src/ICat3/ICat3Helper.cpp
+++ b/Framework/ICat/src/ICat3/ICat3Helper.cpp
@@ -3,7 +3,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#if GCC_VERSION >= 40800 // 4.8.0
// clang-format off
-GCC_DIAG_OFF(literal-suffix)
+DIAG_OFF(literal-suffix)
// clang-format on
#endif
#include "MantidICat/ICat3/ICat3Helper.h"
diff --git a/Framework/ICat/src/ICat4/ICat4GSoapGenerated.cpp b/Framework/ICat/src/ICat4/ICat4GSoapGenerated.cpp
index b58295fd0b34780f542568e18df5e727b746f17d..dc5885d73fb43720cd78cd79210df733d76dcc0f 100644
--- a/Framework/ICat/src/ICat4/ICat4GSoapGenerated.cpp
+++ b/Framework/ICat/src/ICat4/ICat4GSoapGenerated.cpp
@@ -5,16 +5,16 @@
// it is automatically generated code
//------------------------------------------------------------------------------
// clang-format off
-GCC_DIAG_OFF(cast-qual)
-GCC_DIAG_OFF(conversion)
-GCC_DIAG_OFF(unused-parameter)
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(cast-qual)
+DIAG_OFF(conversion)
+DIAG_OFF(unused-parameter)
+DIAG_OFF(strict-aliasing)
+DIAG_OFF(format)
+DIAG_OFF(vla)
// clang-format on
-GCC_DIAG_OFF(format)
-GCC_DIAG_OFF(vla)
#if GCC_VERSION >= 40800 // 4.8.0
// clang-format off
-GCC_DIAG_OFF(literal-suffix)
+DIAG_OFF(literal-suffix)
// clang-format on
#endif
#ifdef _WIN32
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyHelper.h b/Framework/Kernel/inc/MantidKernel/PropertyHelper.h
index 1fbe4423e46fbfe551d38189c90131e086e59caf..ad0e64d71191b74bc43f12223436955da383ed27 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyHelper.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyHelper.h
@@ -124,14 +124,8 @@ std::string toPrettyString(
}
return Strings::shorten(retVal, maxLength);
}
-
-// AppleClang gives warning if the result is unused.
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
// clang-format off
-GCC_DIAG_OFF(unused-function)
+DIAG_OFF(unused-function)
// clang-format on
/** Explicit specialization for a property of type std::vector<bool>.
* This will catch Vectors of char, double, float etc.
@@ -148,11 +142,8 @@ std::string toPrettyString(
maxLength);
}
// clang-format off
-GCC_DIAG_ON(unused-function)
+DIAG_ON(unused-function)
// clang-format on
-#if __clang__
-#pragma clang diagnostic pop
-#endif
/// Specialization for a property of type std::vector<std::vector>.
template <typename T>
diff --git a/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h b/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h
index a9195a1f03715092fd70afe92ce5a2c5087df566..3e6eaab2c1c51a326de6ef71d1b83f74a20d5f08 100644
--- a/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h
+++ b/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h
@@ -76,30 +76,34 @@
// define macros for turning the warning suppression on/off for GCC
// note that we turn off unknown warnings here as well so that we can use the
// same macro for GCC and clang.
+// clang-format off
#if GCC_VERSION >= 40600 // GCC 4.6.0
-#define DIAG_OFF(x) \
- DIAG_PRAGMA(push) \
- DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, unknown-warning)) \
+#define DIAG_OFF(x) \
+ DIAG_PRAGMA(push) \
+ DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, unknown-warning)) \
DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, x))
#define DIAG_ON(x) DIAG_PRAGMA(pop)
#else
-#define DIAG_OFF(x) \
- DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, unknown-warning)) \
+#define DIAG_OFF(x) \
+ DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, unknown-warning)) \
DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, x))
-#define DIAG_ON(x) \
- DIAG_PRAGMA(warning DIAG_JOINSTR(-W, unknown-warning)) \
- DIAG_PRAGMA(warning DIAG_JOINSTR(-W, x))
+#define DIAG_ON(x) \
+ DIAG_PRAGMA(warning DIAG_JOINSTR(-W, unknown-warning)) \
+ DIAG_PRAGMA(warning DIAG_JOINSTR(-W, x))
#endif
+// clang-format on
#elif defined(CLANG_VERSION) && CLANG_VERSION >= 306
// define macros for turning the warning suppression on/off for clang
// note that we turn off unknown warnings here as well so that we can use the
// same macro for GCC and clang.
-#define DIAG_OFF(x) \
- DIAG_PRAGMA(push) \
- DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, unknown-warning-option)) \
- DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, x))
+// clang-format off
+#define DIAG_OFF(x) \
+ DIAG_PRAGMA(push) \
+ DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, unknown-warning-option)) \
+ DIAG_PRAGMA(ignored DIAG_JOINSTR(-W, x))
#define DIAG_ON(x) DIAG_PRAGMA(pop)
+// clang-format on
#else
// neither clang or GCC
#define DIAG_OFF(x)
@@ -108,7 +112,6 @@
#endif
-
// Defining this macro separately since clang-tidy tries to add spaces around
// the hyphen and we use it in a lot of test files.
// clang-format off
@@ -124,10 +127,10 @@
#endif
// clang-format on
-#ifdef GCC_VERSION
-#define GCC_UNUSED_FUNCTION __attribute__((unused))
+#if defined(GCC_VERSION) || defined(CLANG_VERSION)
+#define UNUSED_FUNCTION __attribute__((unused))
#else
-#define GCC_UNUSED_FUNCTION
+#define UNUSED_FUNCTION
#endif
#endif /*MANTID_KERNEL_WARNINGSUPPRESSIONS_H_*/
diff --git a/Framework/Kernel/inc/MantidKernel/normal_distribution.h b/Framework/Kernel/inc/MantidKernel/normal_distribution.h
index 54941b602e3c452b9e04d03690f1e7e56c4b87e4..c7c304b1fcd2a0e220f9d74458f8074b026edc6a 100644
--- a/Framework/Kernel/inc/MantidKernel/normal_distribution.h
+++ b/Framework/Kernel/inc/MantidKernel/normal_distribution.h
@@ -171,9 +171,7 @@ public:
};
// clang-format off
-#if !defined(__clang__)
-GCC_DIAG_OFF(maybe-uninitialized)
-#endif
+DIAG_OFF(maybe-uninitialized)
// clang-format on
template <class _RealType>
template <class _URNG>
@@ -201,9 +199,7 @@ _RealType normal_distribution<_RealType>::operator()(_URNG &__g,
return _Up * __p.stddev() + __p.mean();
}
// clang-format off
-#if !defined(__clang__)
-GCC_DIAG_ON(maybe-uninitialized)
-#endif
+DIAG_ON(maybe-uninitialized)
// clang-format on
template <class _CharT, class _Traits, class _RT>
diff --git a/Framework/Kernel/test/MDUnitFactoryTest.h b/Framework/Kernel/test/MDUnitFactoryTest.h
index e38465297483b425a2a265b4f9d34f1711aaa151..a6f16cd77f02a7c0316ac3f36ca5b8c53bdf78c9 100644
--- a/Framework/Kernel/test/MDUnitFactoryTest.h
+++ b/Framework/Kernel/test/MDUnitFactoryTest.h
@@ -14,7 +14,7 @@ using namespace testing;
/**
* Helper Mock MDUnit
*/
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockMDUnit : public MDUnit {
public:
MOCK_CONST_METHOD0(getUnitLabel, UnitLabel());
@@ -31,7 +31,7 @@ public:
MOCK_CONST_METHOD1(createRaw, MDUnit *(const std::string &));
MOCK_CONST_METHOD1(canInterpret, bool(const std::string &));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class MDUnitFactoryTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
diff --git a/Framework/Kernel/test/NDRandomNumberGeneratorTest.h b/Framework/Kernel/test/NDRandomNumberGeneratorTest.h
index 8954034ea46379c464a5a4c3d9f5f8571c7502dc..521b4635c2a2a5bd0ac020505abe63d70bca9990 100644
--- a/Framework/Kernel/test/NDRandomNumberGeneratorTest.h
+++ b/Framework/Kernel/test/NDRandomNumberGeneratorTest.h
@@ -17,12 +17,12 @@ private:
public:
Mock3DRandomNumberGenerator()
: Mantid::Kernel::NDRandomNumberGenerator(3) {}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(generateNextPoint, void());
MOCK_METHOD0(restart, void());
MOCK_METHOD0(save, void());
MOCK_METHOD0(restore, void());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
public:
diff --git a/Framework/Kernel/test/UserCatalogInfoTest.h b/Framework/Kernel/test/UserCatalogInfoTest.h
index 34d5d9680ae15832d8e847a73087fa2c9e0b8260..64fcf75a3aa735413c6355a12062eb2b52736b01 100644
--- a/Framework/Kernel/test/UserCatalogInfoTest.h
+++ b/Framework/Kernel/test/UserCatalogInfoTest.h
@@ -19,7 +19,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
return out;
}
}
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
using namespace Mantid::Kernel;
class MockCatalogConfigService : public CatalogConfigService {
public:
@@ -37,7 +37,7 @@ public:
MOCK_CONST_METHOD0(linuxPrefix, const std::string());
MOCK_CONST_METHOD0(clone, ICatalogInfo *());
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
// Adaptee
struct UserType {
std::string getString(const std::string &) const { return "my_value"; }
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h b/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h
index fec497f9fc0f03790e626687a81c619585ef8e9e..97e7f424fffd16e7811a8ad94bb53e617c12ff1a 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h
@@ -1,15 +1,18 @@
#ifndef TCP_EVENT_STREAM_DEFS_H
#define TCP_EVENT_STREAM_DEFS_H
+#include "MantidKernel/WarningSuppressions.h"
+
#include <cstdint>
#include <cstring>
#include <ctime>
#include <vector>
// to ignore warnings when comparing header versions
-#if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
-#pragma GCC diagnostic ignored "-Wtype-limits"
-#elif defined(_WIN32)
+// clang-format off
+DIAG_OFF(type-limits)
+// clang-format on
+#if defined(_WIN32)
#pragma warning(disable : 4296)
#endif
@@ -49,10 +52,10 @@ struct TCPStreamEventHeader {
TCPStreamEventHeader(uint32_t type_)
: marker1(marker), marker2(marker), version(current_version),
length(sizeof(TCPStreamEventHeader)), type(type_) {}
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wtautological-compare"
-#endif
+
+ // clang-format off
+ DIAG_OFF(autological-compare)
+ // clang-format on
bool isValid() const {
return marker1 == marker && marker2 == marker &&
length >= sizeof(TCPStreamEventHeader) &&
@@ -60,9 +63,10 @@ struct TCPStreamEventHeader {
minorVersion() >= TCPStreamEventHeader::minor_version &&
type != InvalidStream;
}
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+ DIAG_ON(autological-compare)
+ // clang-format on
+
static const uint32_t major_version =
1; ///< starts at 1, then incremented whenever layout of this or further
/// packets changes in a non backward compatible way
@@ -190,4 +194,8 @@ struct TCPStreamEventDataSE {
};
}
}
+
+// clang-format off
+DIAG_ON(type-limits)
+// clang-format on
#endif /* TCP_EVENT_STREAM_DEFS_H */
diff --git a/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp b/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp
index 198b01fa5a5dc05ddb3aafc25acd1a14f9569147..e6ead5a47d939f1f90c669f987830880bae2bd3e 100644
--- a/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp
+++ b/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp
@@ -22,7 +22,7 @@
// Avoid compiler warnings on gcc from unused static constants in
// isisds_command.h
// clang-format off
-GCC_DIAG_OFF(unused-variable)
+DIAG_OFF(unused-variable)
// clang-format on
#endif
#include "DAE/idc.h"
diff --git a/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp b/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp
index 53c620436f3292a33d09d648cac9145a94bcde34..ec5fa9a69a90c02e6a07633cdb1de356f943eccb 100644
--- a/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp
+++ b/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp
@@ -20,7 +20,7 @@
// Avoid compiler warnings on gcc from unused static constants in
// isisds_command.h
// clang-format off
-GCC_DIAG_OFF(unused-variable)
+DIAG_OFF(unused-variable)
// clang-format on
#endif
#include "DAE/idc.h"
diff --git a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
index d702caa6db8a3189a43dd6f1ec1a6355926796bf..ce1c7af7835c730333458f1142c54f5048f37d04 100644
--- a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
+++ b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
@@ -14,13 +14,17 @@
#include "MantidLiveData/Exception.h"
#include "MantidLiveData/Kafka/KafkaTopicSubscriber.h"
-GCC_DIAG_OFF(conversion)
+// clang-format off
+DIAG_OFF(conversion)
+// clang-format on
#include "private/Schema/ba57_run_info_generated.h"
#include "private/Schema/df12_det_spec_map_generated.h"
#include "private/Schema/ev42_events_generated.h"
#include "private/Schema/f142_logdata_generated.h"
#include "private/Schema/is84_isis_events_generated.h"
-GCC_DIAG_ON(conversion)
+// clang-format off
+DIAG_ON(conversion)
+// clang-format on
using namespace Mantid::Types;
diff --git a/Framework/LiveData/test/KafkaTesting.h b/Framework/LiveData/test/KafkaTesting.h
index 10fccde3adf19a3f535466174d5fb3d24ea7cb5e..e0e52f06a5c29def4303cac439b188964cfd680b 100644
--- a/Framework/LiveData/test/KafkaTesting.h
+++ b/Framework/LiveData/test/KafkaTesting.h
@@ -8,13 +8,17 @@
#include "MantidTypes/Core/DateAndTime.h"
#include <gmock/gmock.h>
-GCC_DIAG_OFF(conversion)
+// clang-format off
+DIAG_OFF(conversion)
+// clang-format on
#include "Kafka/private/Schema/ba57_run_info_generated.h"
#include "Kafka/private/Schema/df12_det_spec_map_generated.h"
#include "Kafka/private/Schema/ev42_events_generated.h"
#include "Kafka/private/Schema/f142_logdata_generated.h"
#include "Kafka/private/Schema/is84_isis_events_generated.h"
-GCC_DIAG_ON(conversion)
+// clang-format off
+DIAG_ON(conversion)
+// clang-format on
#include <ctime>
@@ -29,7 +33,7 @@ public:
std::unique_ptr<Mantid::LiveData::IKafkaStreamSubscriber>;
using IKafkaStreamSubscriber_ptr = Mantid::LiveData::IKafkaStreamSubscriber *;
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
// GMock cannot mock non-copyable return types so we resort to a small
// adapter method. Users have to use EXPECT_CALL(subscribe_) instead
MOCK_CONST_METHOD2(subscribe_, IKafkaStreamSubscriber_ptr(
@@ -50,7 +54,7 @@ public:
return std::unique_ptr<Mantid::LiveData::IKafkaStreamSubscriber>(
this->subscribe_(s, offset, option));
}
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
// -----------------------------------------------------------------------------
diff --git a/Framework/MDAlgorithms/src/LoadSQW2.cpp b/Framework/MDAlgorithms/src/LoadSQW2.cpp
index 434846121ae7440bd3df38689bceb32a6137ceee..07855d71443970f0d6732d8c81117e63fa25b1db 100644
--- a/Framework/MDAlgorithms/src/LoadSQW2.cpp
+++ b/Framework/MDAlgorithms/src/LoadSQW2.cpp
@@ -12,12 +12,13 @@
#include "MantidGeometry/MDGeometry/MDHistoDimension.h"
#include "MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h"
#include "MantidKernel/ListValidator.h"
-#include "MantidKernel/make_unique.h"
#include "MantidKernel/Matrix.h"
#include "MantidKernel/Memory.h"
#include "MantidKernel/ThreadScheduler.h"
#include "MantidKernel/Timer.h"
#include "MantidKernel/V3D.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include "MantidKernel/make_unique.h"
namespace Mantid {
namespace MDAlgorithms {
@@ -482,12 +483,11 @@ std::vector<float> LoadSQW2::calculateDimLimitsFromData() {
return dimLimits;
}
-#ifdef __clang__
// The missing braces warning is a false positive -
// https://llvm.org/bugs/show_bug.cgi?id=21629
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmissing-braces"
-#endif
+// clang-format off
+DIAG_OFF(missing-braces)
+// clang-format on
/**
* Create the Q MDHistoDimension for the output frame and given information
* from the file
@@ -540,9 +540,10 @@ LoadSQW2::createQDimension(size_t index, float dimMin, float dimMax,
return builder.create();
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+
+// clang-format off
+DIAG_ON(missing-braces)
+// clang-format on
/**
* Create an energy dimension
diff --git a/Framework/MDAlgorithms/test/BinMDTest.h b/Framework/MDAlgorithms/test/BinMDTest.h
index 980e8d0b7b4a9b5e64772d2a4d7352c46caafd9e..c2e46f0fc7c28080d4512f9b5df891e1e9476bff 100644
--- a/Framework/MDAlgorithms/test/BinMDTest.h
+++ b/Framework/MDAlgorithms/test/BinMDTest.h
@@ -34,7 +34,7 @@ using namespace Mantid::MDAlgorithms;
using Mantid::coord_t;
class BinMDTest : public CxxTest::TestSuite {
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
private:
// Helper class. Mock Implicit function.
class MockImplicitFunction : public Mantid::Geometry::MDImplicitFunction {
@@ -45,7 +45,7 @@ private:
std::string getName() const override { return "MockImplicitFunction"; }
MOCK_CONST_METHOD0(toXMLString, std::string());
};
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
// Helper class. Builds mock implicit functions.
class MockImplicitFunctionBuilder
: public Mantid::API::ImplicitFunctionBuilder {
diff --git a/Framework/MDAlgorithms/test/BinaryOperationMDTest.h b/Framework/MDAlgorithms/test/BinaryOperationMDTest.h
index eef27e2ee8c0fad55df02a2a20bd72d4f3e4462a..d3ea69b26bb490c267a36afa979dab74e301f0c1 100644
--- a/Framework/MDAlgorithms/test/BinaryOperationMDTest.h
+++ b/Framework/MDAlgorithms/test/BinaryOperationMDTest.h
@@ -19,7 +19,7 @@ using namespace Mantid::DataObjects;
using namespace Mantid::MDAlgorithms;
using namespace testing;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockBinaryOperationMD : public BinaryOperationMD {
public:
@@ -35,7 +35,7 @@ public:
Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar));
void exec() override { BinaryOperationMD::exec(); }
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class BinaryOperationMDTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
diff --git a/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h b/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h
index dc7024cd30292cce063f9b7923f0974dff579693..a29594e1afc86328bdb6870b34350b15c7cd8824 100644
--- a/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h
+++ b/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h
@@ -9,7 +9,7 @@
using namespace Mantid::MDAlgorithms;
using namespace testing;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockBooleanBinaryOperationMD : public BooleanBinaryOperationMD {
public:
MOCK_METHOD0(initExtraProperties, void());
@@ -17,7 +17,7 @@ public:
void(Mantid::DataObjects::MDHistoWorkspace_sptr,
Mantid::DataObjects::MDHistoWorkspace_const_sptr));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class BooleanBinaryOperationMDTest : public CxxTest::TestSuite {
public:
void test_basics() {
diff --git a/Framework/MDAlgorithms/test/LoadSQW2Test.h b/Framework/MDAlgorithms/test/LoadSQW2Test.h
index f54287f8e6f8d7d28a58bc896d0e72e3caab5185..292a2d375e66e7db78001032c287f06dcf131407 100644
--- a/Framework/MDAlgorithms/test/LoadSQW2Test.h
+++ b/Framework/MDAlgorithms/test/LoadSQW2Test.h
@@ -8,8 +8,9 @@
#include "MantidAPI/Run.h"
#include "MantidAPI/Sample.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
-#include "MantidMDAlgorithms/LoadSQW2.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidKernel/make_unique.h"
+#include "MantidMDAlgorithms/LoadSQW2.h"
#include <Poco/TemporaryFile.h>
@@ -189,12 +190,9 @@ private:
}
}
-#ifdef __clang__
-// The missing braces warning is a false positive -
-// https://llvm.org/bugs/show_bug.cgi?id=21629
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmissing-braces"
-#endif
+ // clang-format off
+ DIAG_OFF(missing-braces)
+ // clang-format on
DimensionProperties getExpectedDimProperties(std::string outputFrame,
DataType dtype) {
DimensionProperties expected;
@@ -235,9 +233,9 @@ private:
return expected;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+ DIAG_ON(missing-braces)
+ // clang-format on
void checkExperimentInfoAsExpected(const IMDEventWorkspace &outputWS) {
TS_ASSERT_EQUALS(2, outputWS.getNumExperimentInfo());
diff --git a/Framework/MDAlgorithms/test/PreprocessDetectorsToMDTest.h b/Framework/MDAlgorithms/test/PreprocessDetectorsToMDTest.h
index c13b00a06eb133353cadd58e2e587f4837f978fd..dd4d3efa6529c82e5cf38a2e0c0bc46f28ea1f95 100644
--- a/Framework/MDAlgorithms/test/PreprocessDetectorsToMDTest.h
+++ b/Framework/MDAlgorithms/test/PreprocessDetectorsToMDTest.h
@@ -101,7 +101,6 @@ public:
auto &Azimuthal = tws->getColVector<double>("Azimuthal");
auto &detDir = tws->getColVector<Kernel::V3D>("DetDirections");
- TS_ASSERT(&detDir[0]);
TS_ASSERT_EQUALS(nVal, detDir.size());
for (size_t i = 0; i < nVal; i++) {
diff --git a/Framework/MDAlgorithms/test/UnaryOperationMDTest.h b/Framework/MDAlgorithms/test/UnaryOperationMDTest.h
index a7ffd215560eb79a79e90ae1481a61243a5267d5..af029f9354117d251c09d9c66919bbbfca84ad75 100644
--- a/Framework/MDAlgorithms/test/UnaryOperationMDTest.h
+++ b/Framework/MDAlgorithms/test/UnaryOperationMDTest.h
@@ -23,11 +23,11 @@ using namespace testing;
class MockUnaryOperationMD : public UnaryOperationMD {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(execEvent, void(Mantid::API::IMDEventWorkspace_sptr));
MOCK_METHOD0(checkInputs, void());
MOCK_METHOD1(execHisto, void(Mantid::DataObjects::MDHistoWorkspace_sptr));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
void exec() override { UnaryOperationMD::exec(); }
};
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index d2621202c0deb7c2dd0b539c769be78a4e31201b..423f2c29b1f1bb63ef83f2031b2049e6291eeae1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -58,14 +58,13 @@ using declarePropertyType3 = void (*)(boost::python::object &,
using declarePropertyType4 = void (*)(boost::python::object &,
const std::string &,
const boost::python::object &, const int);
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Overload types
BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload,
PythonAlgorithm::declarePyAlgProperty, 2, 3)
@@ -73,10 +72,11 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload,
PythonAlgorithm::declarePyAlgProperty, 3, 6)
BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType3_Overload,
PythonAlgorithm::declarePyAlgProperty, 4, 5)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
/**
* Map a CancelException to a Python KeyboardInterupt
* @param exc A cancel exception to translate. Unused here as the message is
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
index c11799f6d88c4461180d91c4a32f9e8416462621..b1b8c889f482ea7b61b7077749ae1dd4850ec196 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -82,7 +82,7 @@ list getDescriptors(AlgorithmFactoryImpl &self, bool includeHidden) {
std::recursive_mutex PYALG_REGISTER_MUTEX;
// clang-format off
-GCC_DIAG_OFF(cast-qual)
+DIAG_OFF(cast-qual)
// clang-format on
/**
@@ -118,24 +118,25 @@ void subscribe(AlgorithmFactoryImpl &self, const boost::python::object &obj) {
// from the FileLoaderRegistry
FileLoaderRegistry::Instance().unsubscribe(descr.first, descr.second);
}
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(existsOverloader, exists, 1, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
///@endcond
}
// clang-format off
-GCC_DIAG_ON(cast-qual)
+DIAG_ON(cast-qual)
// clang-format on
void export_AlgorithmFactory() {
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index 17e516340fa0c37c7906d8c800e0f72080b7f9e9..a0587d8cb71b72160b2095eccdf6cb7f69b2f573 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -56,24 +56,24 @@ boost::python::list runningInstancesOf(AlgorithmManagerImpl &self,
///@cond
//------------------------------------------------------------------------------------------------------
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
/// Define overload generators
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(create_overloads,
AlgorithmManagerImpl::create, 1, 2)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createUnmanaged_overloads,
AlgorithmManagerImpl::createUnmanaged, 1,
2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index c5374df149d54898efae6796d6520cc330101a3f..2a32a21e5da1658987bfba72b77ce4cb11d92f72 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -29,21 +29,20 @@ GET_POINTER_SPECIALIZATION(Axis)
namespace {
//------------------------------- Overload macros ---------------------------
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Overloads for operator() function which has 1 optional argument
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Axis_getValue, Axis::getValue, 1, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
/**
* Extract the axis values as a sequence. A numpy array is used if the
* data is numerical or a simple python list is used if the data is a string
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp
index ff4ffee34c9c099eb107747b6d0c76c82807a56a..f850a9fe7f913c754c4a029f734917fe1e756f51 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp
@@ -19,18 +19,18 @@ using getParameterType2 =
using setParameterType2 = void (CompositeFunction::*)(const std::string &,
const double &, bool);
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
-GCC_DIAG_OFF(conversion)
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads,
setParameter, 2, 3)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
} // namespace
void export_CompositeFunction() {
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
index 1fef2a19a2f6cbbde66471abb997e1ddc3cc472b..32325425ed86db99bbc27b401e62f6a7dadaba3b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
@@ -18,21 +18,21 @@ using namespace boost::python;
GET_POINTER_SPECIALIZATION(ExperimentInfo)
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
/// Overload generator for getInstrumentFilename
BOOST_PYTHON_FUNCTION_OVERLOADS(getInstrumentFilename_Overload,
ExperimentInfo::getInstrumentFilename, 1, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
void export_ExperimentInfo() {
register_ptr_to_python<boost::shared_ptr<ExperimentInfo>>();
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
index 0431dcd3f7ccf62d52e9bf5b4adea7c072335810..26f6be43d65bd5936d5586543947429345ae0805 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
@@ -9,19 +9,19 @@ using Mantid::API::FileFinderImpl;
using namespace boost::python;
namespace {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getFullPathOverloader, getFullPath, 1, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
}
void export_FileFinder() {
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index 3cc36a8ea482e7b0b848db351bf2fee7a1fe5556..0a0bf2692b468a0f71c0986fbc88ae3bebbeea17 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -50,14 +50,13 @@ double getError(IFunction &self, std::string const &name) {
// -- Set property overloads --
// setProperty(index,value,explicit)
using setParameterType1 = void (IFunction::*)(size_t, const double &, bool);
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
setParameter, 2, 3)
// setProperty(index,value,explicit)
@@ -74,10 +73,11 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(fix_Overloads, fix, 1, 2)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(fixAll_Overloads, fixAll, 0, 1)
using removeTieByName = void (IFunction::*)(const std::string &);
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
index b5d7c509b12b085e55e4edc7dab7431a9f4af274..e03233f2ace1dd26dc52b91b7e7435f7d5380196 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
@@ -7,7 +7,7 @@
#include <boost/python/list.hpp>
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
using Mantid::API::IMaskWorkspace;
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 38480dd58b8333c362055397a39beafa044a33e0..389f63f20ccdde5aecbfe70f06fa380db51d083b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -49,21 +49,21 @@ using return_readwrite_numpy =
return_value_policy<VectorRefToNumpy<WrapReadWrite>>;
//------------------------------- Overload macros ---------------------------
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Overloads for binIndexOf function which has 1 optional argument
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(MatrixWorkspace_binIndexOfOverloads,
MatrixWorkspace::binIndexOf, 1, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
/**
* Set the values from an python array-style object into the given spectrum in
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
index 505e150c33d2c53d63c30432493fee37bb8ebeb6..0239146f3f5adc5ed4837fbeb47cf7a29135168d 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
@@ -15,7 +15,7 @@ using namespace Mantid::API;
using namespace Mantid::PythonInterface;
using namespace boost::python;
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
namespace {
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
index cce9b24dbfafac081be236d3b8833d505d007483..dcb42b1665530c0f7ee3f293f1ba2bbe9e6471f1 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
@@ -115,20 +115,20 @@ bpl::list keys(Run &self) {
return names;
}
}
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(integrateProtonCharge_Overload,
integrateProtonCharge, 0, 1)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
void export_Run() {
// Pointer
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index 68a4e2a8e2c551e5a65f975cfd264aea56c362f4..227f9999e6cd250ab28b43dfe1e286c9af57e275 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -19,20 +19,21 @@ GET_POINTER_SPECIALIZATION(Workspace)
namespace {
///@cond
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Workspace_isDirtyOverloads,
Workspace::isDirty, 0, 1)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
+
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index 3ded562f0ae9cd93aeb91bfc2902b7fa7e3ec651..9561fa83a4e40b53c434dfade43aa12bbdb7f089 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -46,22 +46,22 @@ Workspace_sptr createFromParentPtr(WorkspaceFactoryImpl &self,
}
/// Overload generator for create
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_FUNCTION_OVERLOADS(createFromParent_Overload, createFromParentPtr,
2, 5)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createTable_Overload, createTable, 0, 1)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createPeaks_Overload, createPeaks, 0, 1)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
}
void export_WorkspaceFactory() {
diff --git a/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp b/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp
index 27cde8ecbc1ff9bf1d46cf9e60961c58c9b3f992..c20274fd4ae17ec16fcf6b3945a1945181960b14 100644
--- a/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp
+++ b/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp
@@ -1,13 +1,14 @@
#include "MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h"
-#include "MantidPythonInterface/kernel/Registry/PropertyWithValueFactory.h"
-#include "MantidPythonInterface/kernel/Environment/WrapperHelpers.h"
-#include "MantidPythonInterface/kernel/Environment/CallMethod.h"
-#include "MantidPythonInterface/kernel/Environment/GlobalInterpreterLock.h"
-#include "MantidPythonInterface/kernel/Converters/PySequenceToVector.h"
#include "MantidAPI/DataProcessorAlgorithm.h"
-#include "MantidAPI/SerialAlgorithm.h"
-#include "MantidAPI/ParallelAlgorithm.h"
#include "MantidAPI/DistributedAlgorithm.h"
+#include "MantidAPI/ParallelAlgorithm.h"
+#include "MantidAPI/SerialAlgorithm.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include "MantidPythonInterface/kernel/Converters/PySequenceToVector.h"
+#include "MantidPythonInterface/kernel/Environment/CallMethod.h"
+#include "MantidPythonInterface/kernel/Environment/GlobalInterpreterLock.h"
+#include "MantidPythonInterface/kernel/Environment/WrapperHelpers.h"
+#include "MantidPythonInterface/kernel/Registry/PropertyWithValueFactory.h"
#include <boost/python/class.hpp>
#include <boost/python/dict.hpp>
@@ -145,10 +146,10 @@ bool AlgorithmAdapter<BaseAlgorithm>::isRunning() const {
return SuperClass::isRunning();
} else {
Environment::GlobalInterpreterLock gil;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wparentheses-equality"
-#endif
+
+ // clang-format off
+ DIAG_OFF(parentheses-equality)
+ // clang-format on
PyObject *result = PyObject_CallObject(m_isRunningObj, nullptr);
if (PyErr_Occurred())
throw Environment::PythonException();
@@ -164,9 +165,9 @@ bool AlgorithmAdapter<BaseAlgorithm>::isRunning() const {
throw std::runtime_error(
"Algorithm.isRunning - Expected bool return type.");
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+ DIAG_ON(parentheses-equality)
+ // clang-format on
}
/**
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
index 3d698a7e310e5836a77692797964d9c451ba3386..489bb6f33408d0c3d6308f34373dd01491133458 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
@@ -8,15 +8,14 @@ using Mantid::Geometry::IComponent;
using namespace boost::python;
namespace {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Default parameter function overloads
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParameterNames,
@@ -47,11 +46,11 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParamShortDescription,
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParamDescription,
Component::getParamDescription, 1, 2)
-GCC_DIAG_ON(conversion)
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
}
void export_Component() {
class_<Component, bases<IComponent>, boost::noncopyable>("Component", no_init)
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
index 696b7904f1be53f8581b24550a3ba50687f4d2f2..0797ea91273e5ea0cf3c206bee30651d995155c5 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
@@ -16,21 +16,21 @@ using namespace boost::python;
namespace //<unnamed>
{
///@cond
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// define overloaded functions
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getEulerAngles_overloads,
Goniometer::getEulerAngles, 0, 1)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
///@endcond
/// Set the U vector via a numpy array
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
index b4ea42225ef1bdb6e4629aa159bb6697e923d719..e4a1c6c3fdd567137a8e11c90d44e361d14596e2 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
@@ -16,7 +16,7 @@ using namespace boost::python;
GET_POINTER_SPECIALIZATION(IMDDimension)
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
namespace {
diff --git a/Framework/PythonInterface/mantid/kernel/src/Converters/DateAndTime.cpp b/Framework/PythonInterface/mantid/kernel/src/Converters/DateAndTime.cpp
index 8ae377da1476f393d321fc4400a6c30733b051ec..461f2ad161667560bd615fd1819fb062dc6144b2 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Converters/DateAndTime.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Converters/DateAndTime.cpp
@@ -1,4 +1,5 @@
#include "MantidPythonInterface/kernel/Converters/DateAndTime.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidPythonInterface/kernel/Converters/NumpyFunctions.h"
#include <boost/make_shared.hpp>
#include <boost/python.hpp>
@@ -46,14 +47,13 @@ PyArray_Descr *descr_ns() { return func_PyArray_Descr("M8[ns]"); }
// internal function that handles raw pointer
boost::shared_ptr<Types::Core::DateAndTime>
to_dateandtime(const PyObject *datetime) {
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-qual"
-#endif
+ // clang-format off
+DIAG_OFF(cast-qual)
+ // clang-format on
if (!PyArray_IsScalar(datetime, Datetime)) {
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+DIAG_ON(cast-qual)
+ // clang-format on
throw std::runtime_error("Expected datetime64");
}
diff --git a/Framework/PythonInterface/mantid/kernel/src/Converters/PyObjectToVMD.cpp b/Framework/PythonInterface/mantid/kernel/src/Converters/PyObjectToVMD.cpp
index 618decc87ea6c6c46898a0a164ba1e3ef283a5cd..8f7c008549c254f2dbee9116b284592c56223bf1 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Converters/PyObjectToVMD.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Converters/PyObjectToVMD.cpp
@@ -16,7 +16,7 @@ using boost::python::object;
using boost::python::len;
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
namespace Mantid {
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
index 80e8adbb5b34dc99815c21d678f8dd11a5f4a30e..96d1149cdc97b0a58684b9dee360a2610852cb79 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
@@ -32,23 +32,23 @@ std::string getStringUsingCache(ConfigServiceImpl &self,
return self.getString(key, true);
}
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
/// Overload generator for getInstrument
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getInstrument_Overload, getInstrument, 0,
1)
/// Overload generator for getString
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getString_Overload, getString, 1, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
}
void export_ConfigService() {
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp
index 6afa71964e13396ba4f08e17aa11adc007370e4b..7a4610f42fbb7b8fa6414137f8edc874e5e845e0 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp
@@ -24,19 +24,20 @@ using Mantid::PythonInterface::std_vector_exporter;
using namespace boost::python;
GET_POINTER_SPECIALIZATION(Property)
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(valueAsPrettyStrOverloader,
valueAsPrettyStr, 0, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
void export_Property() {
register_ptr_to_python<Property *>();
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
index ff875b0733244cf090d75c1c892324f3dddad479..7af14bf7efe04291d581adcb78a70aa12089a48e 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
@@ -97,21 +97,21 @@ Statistics getStatisticsNumpy(const NumPy::NdArray &data,
}
}
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getStatisticsOverloads, getStatisticsNumpy, 1,
2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
//============================ Z score
//============================================
@@ -160,21 +160,21 @@ std::vector<double> getModifiedZscoreNumpy(const NumPy::NdArray &data,
}
}
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getModifiedZscoreOverloads,
getModifiedZscoreNumpy, 1, 2)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
//============================ getMoments
//============================================
@@ -225,21 +225,21 @@ std::vector<double> getMomentsAboutOriginNumpy(const NumPy::NdArray &indep,
return getMomentsNumpyImpl(&getMomentsAboutOrigin, indep, depend, maxMoment);
}
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutOriginOverloads,
getMomentsAboutOriginNumpy, 2, 3)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
/**
* Proxy for @see Mantid::Kernel::getMomentsAboutMean so that it can accept
* numpy arrays
@@ -251,21 +251,21 @@ std::vector<double> getMomentsAboutMeanNumpy(const NumPy::NdArray &indep,
return getMomentsNumpyImpl(&getMomentsAboutMean, indep, depend, maxMoment);
}
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
// Define an overload to handle the default argument
BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutMeanOverloads,
getMomentsAboutMeanNumpy, 2, 3)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
///@endcond
}
diff --git a/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp b/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp
index ff167998560b484231b7f011b71c3de7bf5fb9fd..052bbebb7b98050e16904afee24f87536ec05f2a 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp
@@ -2,10 +2,11 @@
// Includes
//-----------------------------------------------------------------------------
#include "MantidPythonInterface/kernel/Registry/PropertyWithValueFactory.h"
+#include "MantidKernel/PropertyWithValue.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidPythonInterface/kernel/Registry/MappingTypeHandler.h"
-#include "MantidPythonInterface/kernel/Registry/TypedPropertyValueHandler.h"
#include "MantidPythonInterface/kernel/Registry/SequenceTypeHandler.h"
-#include "MantidKernel/PropertyWithValue.h"
+#include "MantidPythonInterface/kernel/Registry/TypedPropertyValueHandler.h"
#include <boost/make_shared.hpp>
@@ -186,10 +187,9 @@ const std::string PropertyWithValueFactory::isArray(PyObject *const object) {
PyObject *item = PySequence_Fast_GET_ITEM(object, 0);
// Boolean can be cast to int, so check first.
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wparentheses-equality"
-#endif
+ // clang-format off
+ DIAG_OFF(parentheses-equality)
+ // clang-format on
if (PyBool_Check(item)) {
throw std::runtime_error(
"Unable to support extracting arrays of booleans.");
@@ -197,9 +197,9 @@ const std::string PropertyWithValueFactory::isArray(PyObject *const object) {
if (PyLong_Check(item)) {
return std::string("LongIntArray");
}
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+ DIAG_ON(parentheses-equality)
+// clang-format on
#if PY_MAJOR_VERSION < 3
// In python 2 ints & longs are separate
diff --git a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
index 61e734beea9be664a4eb9a9c21c7889a1b7a578b..36f88528d0785abf902925d3f8fc847793fc8a6d 100644
--- a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
+++ b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
@@ -22,14 +22,13 @@ using namespace Mantid::DataObjects::MDEventsTestHelper;
using namespace Mantid::PythonInterface::Policies;
using namespace WorkspaceCreationHelper;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
+// clang-format off
+DIAG_OFF(unknown-pragmas)
+DIAG_OFF(unused-local-typdef)
// Ignore -Wconversion warnings coming from boost::python
// Seen with GCC 7.1.1 and Boost 1.63.0
-GCC_DIAG_OFF(conversion)
+DIAG_OFF(conversion)
+// clang-format on
BOOST_PYTHON_FUNCTION_OVERLOADS(create2DWorkspaceWithFullInstrument_overloads,
create2DWorkspaceWithFullInstrument, 2, 4)
@@ -39,10 +38,11 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(makeFakeMDHistoWorkspace_overloads,
BOOST_PYTHON_FUNCTION_OVERLOADS(
create2DWorkspaceWithRectangularInstrument_overloads,
create2DWorkspaceWithRectangularInstrument, 3, 3)
-GCC_DIAG_ON(conversion)
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// clang-format off
+DIAG_ON(conversion)
+DIAG_ON(unknown-pragmas)
+DIAG_ON(unused-local-typdef)
+// clang-format on
BOOST_PYTHON_MODULE(WorkspaceCreationHelper) {
using namespace boost::python;
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiMockInstrumentHelpers.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiMockInstrumentHelpers.h
index eb0672a6c575d8ee67ff563de651d086ce9900a9..41f3fb1d6adad6aa167edfc5326abcb1e1f15d32 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiMockInstrumentHelpers.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiMockInstrumentHelpers.h
@@ -53,14 +53,14 @@ public:
void loadConfiguration(Instrument_const_sptr poldiInstrument) override {
UNUSED_ARG(poldiInstrument);
}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(efficiency, double());
MOCK_METHOD1(twoTheta, double(int elementIndex));
MOCK_METHOD1(distanceFromSample, double(int elementIndex));
MOCK_METHOD0(elementCount, size_t());
MOCK_METHOD0(centralElement, size_t());
MOCK_METHOD2(qLimits, DoublePair(double lambdaMin, double lambdaMax));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
const std::vector<int> &availableElements() override {
return m_availableElements;
@@ -105,14 +105,14 @@ public:
void loadConfiguration(Instrument_const_sptr poldiInstrument) override {
UNUSED_ARG(poldiInstrument)
}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(rotationSpeed, double());
MOCK_METHOD0(cycleTime, double());
MOCK_METHOD0(zeroOffset, double());
MOCK_METHOD0(distanceFromSample, double());
MOCK_METHOD1(setRotationSpeed, void(double rotationSpeed));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
const std::vector<double> &slitPositions() override {
return m_slitPositions;
diff --git a/Framework/SINQ/test/PoldiSpectrumPawleyFunctionTest.h b/Framework/SINQ/test/PoldiSpectrumPawleyFunctionTest.h
index e12511644860ddeda60f632cea15e982bc22ce50..15f7b2a39ae3ca5918db0191d663f2677fda45f7 100644
--- a/Framework/SINQ/test/PoldiSpectrumPawleyFunctionTest.h
+++ b/Framework/SINQ/test/PoldiSpectrumPawleyFunctionTest.h
@@ -21,7 +21,7 @@ using Mantid::Kernel::V3D;
using ::testing::_;
using ::testing::Mock;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockPawleyFunction : public IPawleyFunction {
public:
@@ -45,7 +45,7 @@ public:
MOCK_METHOD4(setMatrixWorkspace,
void(MatrixWorkspace_const_sptr, size_t, double, double));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
protected:
void init() override { setDecoratedFunction("Gaussian"); }
};
diff --git a/MantidPlot/src/PythonScript.cpp b/MantidPlot/src/PythonScript.cpp
index 30bd97b20e00fb39c2b577ced3915c4968ba2ace..c7bf3395d61935dafada314b2f018c8846a49be7 100644
--- a/MantidPlot/src/PythonScript.cpp
+++ b/MantidPlot/src/PythonScript.cpp
@@ -32,6 +32,7 @@
#endif
#include "PythonScript.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "PythonScripting.h"
#include "sipAPI_qti.h"
@@ -539,14 +540,13 @@ QVariant PythonScript::evaluateImpl() {
}
}
/* bool */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wparentheses-equality"
-#endif
+ // clang-format off
+ DIAG_OFF(parentheses-equality)
+ // clang-format on
else if (PyBool_Check(pyret)) {
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+ // clang-format off
+ DIAG_ON(parentheses-equality)
+ // clang-format on
qret = QVariant(pyret == Py_True);
}
// could handle advanced types (such as PyList->QValueList) here if needed
diff --git a/qt/paraview_ext/PVPlugins/Sources/MDEWSource/vtkMDEWSource.cxx b/qt/paraview_ext/PVPlugins/Sources/MDEWSource/vtkMDEWSource.cxx
index 73df2744afcee72234a0bfef4501d8bc0270e2d3..4ec4bf724db06995eef02e8ac6464bfd6e99c118 100644
--- a/qt/paraview_ext/PVPlugins/Sources/MDEWSource/vtkMDEWSource.cxx
+++ b/qt/paraview_ext/PVPlugins/Sources/MDEWSource/vtkMDEWSource.cxx
@@ -186,7 +186,7 @@ int vtkMDEWSource::RequestData(vtkInformation *, vtkInformationVector **,
}
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
int vtkMDEWSource::RequestInformation(
vtkInformation *vtkNotUsed(request),
diff --git a/qt/paraview_ext/VatesAPI/src/vtkDataSetToPeaksFilteredDataSet.cpp b/qt/paraview_ext/VatesAPI/src/vtkDataSetToPeaksFilteredDataSet.cpp
index 7797305d984c2cb4f7be80caad32d20e7e359438..4999cbb5ebc29f23b0700ecde9fe3e6324fbd310 100644
--- a/qt/paraview_ext/VatesAPI/src/vtkDataSetToPeaksFilteredDataSet.cpp
+++ b/qt/paraview_ext/VatesAPI/src/vtkDataSetToPeaksFilteredDataSet.cpp
@@ -177,7 +177,7 @@ vtkDataSetToPeaksFilteredDataSet::getPeaksInfo(
}
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
/**
* Get the radius from a PeakShape object.
@@ -225,7 +225,6 @@ Kernel::V3D vtkDataSetToPeaksFilteredDataSet::getPeakPosition(
return position;
}
-// GCC_DIAG_ON(strict-aliasing)
/**
* Get the radius for no shape
* @returns The shape of the radius.
diff --git a/qt/paraview_ext/VatesAPI/test/BoxInfoTest.h b/qt/paraview_ext/VatesAPI/test/BoxInfoTest.h
index bf3d5175bae92ac45d22700850ee1e9e377d3a83..77b42a294456de564ea846f18572926bc2110152 100644
--- a/qt/paraview_ext/VatesAPI/test/BoxInfoTest.h
+++ b/qt/paraview_ext/VatesAPI/test/BoxInfoTest.h
@@ -55,7 +55,7 @@ public:
}
// clang-format off
- GCC_DIAG_OFF(strict-aliasing)
+ DIAG_OFF(strict-aliasing)
// clang-format on
void test_initial_recursion_depth_is_1_for_MD_Event_w_split() {
// Arrange
diff --git a/qt/paraview_ext/VatesAPI/test/ConcretePeaksPresenterVsiTest.h b/qt/paraview_ext/VatesAPI/test/ConcretePeaksPresenterVsiTest.h
index 548610c922efe64945257cbb3ad73cd7af0576a1..efd6d6cc00ade9cd72d09c3548bfd8bbaad3fb92 100644
--- a/qt/paraview_ext/VatesAPI/test/ConcretePeaksPresenterVsiTest.h
+++ b/qt/paraview_ext/VatesAPI/test/ConcretePeaksPresenterVsiTest.h
@@ -23,7 +23,7 @@
using namespace ::testing;
using namespace Mantid::VATES;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockPeakConcrete : public Mantid::DataObjects::Peak {
public:
MOCK_CONST_METHOD0(getHKL, Mantid::Kernel::V3D(void));
@@ -38,7 +38,7 @@ public:
MOCK_METHOD1(getPeak, Mantid::DataObjects::Peak &(int peakNum));
MOCK_CONST_METHOD1(getPeak, const Mantid::DataObjects::Peak &(int peakNum));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class ConcretePeaksPresenterVsiTest : public CxxTest::TestSuite {
public:
void testSetupPresenterCorrectly() {
@@ -114,4 +114,4 @@ public:
}
};
-#endif
\ No newline at end of file
+#endif
diff --git a/qt/paraview_ext/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h b/qt/paraview_ext/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
index 797b1b4bbdd104d81023a6ee29037f70a0b56bef..67f605521607a98859fc5a362aa70d9d2b55b85c 100644
--- a/qt/paraview_ext/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
+++ b/qt/paraview_ext/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
@@ -26,12 +26,12 @@ private:
// Helper type. Mocks a Workspace Provider.
class MockWorkspaceProvider : public Mantid::VATES::WorkspaceProvider {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(canProvideWorkspace, bool(std::string));
MOCK_CONST_METHOD1(fetchWorkspace,
Mantid::API::Workspace_sptr(std::string));
MOCK_CONST_METHOD1(disposeWorkspace, void(std::string));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
// Helper method. Generates and returns a valid IMDEventWorkspace
diff --git a/qt/paraview_ext/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h b/qt/paraview_ext/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h
index 21716b3fb4efa7091a640accc8022214ca6ba93a..13505a319b34d3f8b4acb1a5ce006d4d1de59ac7 100644
--- a/qt/paraview_ext/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h
+++ b/qt/paraview_ext/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h
@@ -27,12 +27,12 @@ private:
// Helper type. Mocks a Workspace Provider.
class MockWorkspaceProvider : public Mantid::VATES::WorkspaceProvider {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(canProvideWorkspace, bool(std::string));
MOCK_CONST_METHOD1(fetchWorkspace,
Mantid::API::Workspace_sptr(std::string));
MOCK_CONST_METHOD1(disposeWorkspace, void(std::string));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
// Helper method. Generates and returns a valid IMDHistoWorkspace
diff --git a/qt/paraview_ext/VatesAPI/test/MockObjects.h b/qt/paraview_ext/VatesAPI/test/MockObjects.h
index 0a58626c34f603f3d2e8a56d72503a5718fd5cef..d780778f224e037d2b00806cd2008d41f19bfa7a 100644
--- a/qt/paraview_ext/VatesAPI/test/MockObjects.h
+++ b/qt/paraview_ext/VatesAPI/test/MockObjects.h
@@ -69,7 +69,7 @@ public:
~FakeIMDDimension() override {}
};
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
//=================================================================================================
/// Concrete mocked implementation of IMDWorkspace for testing.
class MockIMDWorkspace : public Mantid::API::IMDWorkspace {
@@ -178,7 +178,7 @@ public:
MOCK_METHOD1(eventRaised, void(double));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class FakeProgressAction : public Mantid::VATES::ProgressAction {
void eventRaised(double) override {}
@@ -189,7 +189,7 @@ Create a field data entry containing (as contents) the argument text.
@param testData : Text to enter
@return new vtkFieldData object containing text.
*/
-GCC_UNUSED_FUNCTION vtkFieldData *
+UNUSED_FUNCTION vtkFieldData *
createFieldDataWithCharArray(std::string testData) {
vtkFieldData *fieldData = vtkFieldData::New();
vtkCharArray *charArray = vtkCharArray::New();
@@ -274,7 +274,7 @@ view.
view.
@return full xml as string.
*/
-GCC_UNUSED_FUNCTION std::string
+UNUSED_FUNCTION std::string
constructXML(const std::string &xDimensionIdMapping,
const std::string &yDimensionIdMapping,
const std::string &zDimensionIdMapping,
@@ -372,7 +372,7 @@ view.
view.
@return full xml as string.
*/
-GCC_UNUSED_FUNCTION std::string
+UNUSED_FUNCTION std::string
constructXMLForMDEvHelperData(const std::string &xDimensionIdMapping,
const std::string &yDimensionIdMapping,
const std::string &zDimensionIdMapping,
@@ -403,7 +403,7 @@ Mantid::API::Workspace_sptr createSimple3DWorkspace() {
return outWs;
}
-GCC_UNUSED_FUNCTION Mantid::API::Workspace_sptr
+UNUSED_FUNCTION Mantid::API::Workspace_sptr
get3DWorkspace(bool integratedTDimension, bool sliceMD) {
using namespace Mantid::API;
using namespace Mantid::DataObjects;
@@ -442,8 +442,8 @@ get3DWorkspace(bool integratedTDimension, bool sliceMD) {
* @param fieldName : The requested field data entry
* @return The value of the requested field data entry
*/
-GCC_UNUSED_FUNCTION std::string getStringFieldDataValue(vtkDataSet *ds,
- std::string fieldName) {
+UNUSED_FUNCTION std::string getStringFieldDataValue(vtkDataSet *ds,
+ std::string fieldName) {
vtkAbstractArray *value =
ds->GetFieldData()->GetAbstractArray(fieldName.c_str());
vtkStringArray *array = vtkStringArray::SafeDownCast(value);
diff --git a/qt/paraview_ext/VatesAPI/test/VatesKnowledgeSerializerTest.h b/qt/paraview_ext/VatesAPI/test/VatesKnowledgeSerializerTest.h
index db580dd97bbfba6baaaae7957c8b52ffa79a90da..d6c180ba6807bd0655e30572b4892a1804ce89a2 100644
--- a/qt/paraview_ext/VatesAPI/test/VatesKnowledgeSerializerTest.h
+++ b/qt/paraview_ext/VatesAPI/test/VatesKnowledgeSerializerTest.h
@@ -21,13 +21,13 @@ private:
// Helper class
class MockImplicitFunction : public Mantid::Geometry::MDImplicitFunction {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(isPointContained, bool(const Mantid::coord_t *pPoint));
MOCK_METHOD1(isPointContained, bool(const std::vector<Mantid::coord_t> &));
MOCK_METHOD1(isPointContained, bool(const Mantid::Kernel::VMD &));
MOCK_CONST_METHOD0(getName, std::string());
MOCK_CONST_METHOD0(toXMLString, std::string());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
// Test methods
diff --git a/qt/paraview_ext/VatesAPI/test/vtkDataSetFactoryTest.h b/qt/paraview_ext/VatesAPI/test/vtkDataSetFactoryTest.h
index 99cfedb581f3b2f5ac0805eba050affcce327f08..c21dd7ddb85a24f90b36027138ec52a44e8910a3 100644
--- a/qt/paraview_ext/VatesAPI/test/vtkDataSetFactoryTest.h
+++ b/qt/paraview_ext/VatesAPI/test/vtkDataSetFactoryTest.h
@@ -27,14 +27,14 @@ private:
/// Mocked helper type
class MockvtkDataSetFactory : public Mantid::VATES::vtkDataSetFactory {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(
create, vtkSmartPointer<vtkDataSet>(Mantid::VATES::ProgressAction &));
MOCK_METHOD1(initialize,
void(const boost::shared_ptr<Mantid::API::Workspace> &));
MOCK_CONST_METHOD0(validate, void());
MOCK_CONST_METHOD0(getFactoryTypeName, std::string());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
void setSuccessorConcrete(std::unique_ptr<vtkDataSetFactory> pSuccessor) {
vtkDataSetFactory::setSuccessor(pSuccessor);
}
diff --git a/qt/paraview_ext/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h b/qt/paraview_ext/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h
index 142e573da02ae58cbd6c22345a830f5bf42d787c..0cf478b386905b8ff8b09efad31bfdc56293f410 100644
--- a/qt/paraview_ext/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h
+++ b/qt/paraview_ext/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h
@@ -36,7 +36,7 @@
using namespace Mantid::DataObjects;
using namespace Mantid::VATES;
using namespace ::testing;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockPeakFilter : public Mantid::DataObjects::Peak {
public:
MOCK_CONST_METHOD0(getHKL, Mantid::Kernel::V3D(void));
@@ -50,7 +50,7 @@ public:
MOCK_METHOD1(getPeak, Mantid::DataObjects::Peak &(int peakNum));
MOCK_CONST_METHOD1(getPeak, const Mantid::DataObjects::Peak &(int peakNum));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
struct PeaksFilterDataContainer {
double radius;
double radiusFactor;
diff --git a/qt/paraview_ext/VatesAPI/test/vtkPeakMarkerFactoryTest.h b/qt/paraview_ext/VatesAPI/test/vtkPeakMarkerFactoryTest.h
index 7e5c65cccbd5435cd3cfdc0a3be2648988160bb9..5708fed44b67594a422311a505094cd7f4a40c2b 100644
--- a/qt/paraview_ext/VatesAPI/test/vtkPeakMarkerFactoryTest.h
+++ b/qt/paraview_ext/VatesAPI/test/vtkPeakMarkerFactoryTest.h
@@ -25,7 +25,7 @@ using namespace ::testing;
using namespace Mantid::VATES;
using Mantid::VATES::vtkPeakMarkerFactory;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockPeakShape : public Peak {
public:
@@ -55,7 +55,7 @@ public:
MOCK_METHOD1(getPeak, Mantid::DataObjects::Peak &(int peakNum));
MOCK_CONST_METHOD1(getPeak, const Mantid::DataObjects::Peak &(int peakNum));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
//=====================================================================================
// Functional Tests
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp
index 70ca26a40eb0d8d1d9a3e8ea15bc67bba1e4a6ee..874f9077522b66a39db4617c11e9fac2b7275baf 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp
@@ -269,7 +269,7 @@ pqPipelineRepresentation *ViewBase::getPvActiveRep() {
}
// clang-format off
-GCC_DIAG_OFF(strict-aliasing)
+DIAG_OFF(strict-aliasing)
// clang-format on
/**
* This function creates a ParaView source from a given plugin name and
diff --git a/qt/scientific_interfaces/test/ALCBaselineModellingPresenterTest.h b/qt/scientific_interfaces/test/ALCBaselineModellingPresenterTest.h
index f73d844688015da5ac9a02ddfe30523b50ccc1a5..37b9be20776422f2d71f92db88a0fa4db0e344fa 100644
--- a/qt/scientific_interfaces/test/ALCBaselineModellingPresenterTest.h
+++ b/qt/scientific_interfaces/test/ALCBaselineModellingPresenterTest.h
@@ -24,7 +24,7 @@ using Mantid::HistogramData::Counts;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::LinearGenerator;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockALCBaselineModellingView : public IALCBaselineModellingView {
public:
@@ -91,7 +91,7 @@ MATCHER_P3(QwtDataY, i, value, delta, "") {
MATCHER_P3(VectorValue, i, value, delta, "") {
return fabs(arg.at(i) - value) < delta;
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class ALCBaselineModellingPresenterTest : public CxxTest::TestSuite {
MockALCBaselineModellingView *m_view;
diff --git a/qt/scientific_interfaces/test/ALCDataLoadingPresenterTest.h b/qt/scientific_interfaces/test/ALCDataLoadingPresenterTest.h
index 198408673ed03647c5fd6c2da22a96db4e7dae84..cd66f852cbe70f90ce812e11c3db0667ac956cc0 100644
--- a/qt/scientific_interfaces/test/ALCDataLoadingPresenterTest.h
+++ b/qt/scientific_interfaces/test/ALCDataLoadingPresenterTest.h
@@ -25,7 +25,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
}
}
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockALCDataLoadingView : public IALCDataLoadingView {
// XXX: A workaround, needed because of the way the comma is treated in a
@@ -78,7 +78,7 @@ MATCHER_P3(VectorValue, i, value, delta, "") {
return fabs(arg.at(i) - value) < delta;
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
class ALCDataLoadingPresenterTest : public CxxTest::TestSuite {
MockALCDataLoadingView *m_view;
diff --git a/qt/scientific_interfaces/test/ALCPeakFittingPresenterTest.h b/qt/scientific_interfaces/test/ALCPeakFittingPresenterTest.h
index fc48c3d21b7a8ecc73a2f81e71181eee54a7cb18..904aa8a26e29b5c7ea6c34e5950bb88a54527cf3 100644
--- a/qt/scientific_interfaces/test/ALCPeakFittingPresenterTest.h
+++ b/qt/scientific_interfaces/test/ALCPeakFittingPresenterTest.h
@@ -32,7 +32,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
}
}
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockALCPeakFittingView : public IALCPeakFittingView {
public:
@@ -359,5 +359,5 @@ public:
m_model->setError("Test error");
}
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /* MANTIDQT_CUSTOMINTERFACES_ALCPEAKFITTINGTEST_H_ */
diff --git a/qt/scientific_interfaces/test/EnggDiffFittingModelMock.h b/qt/scientific_interfaces/test/EnggDiffFittingModelMock.h
index 462c9b48879cf0c39fd502a3a7e933dc00b49528..487bf501b9745b30c447f76b94fa0995f0416806 100644
--- a/qt/scientific_interfaces/test/EnggDiffFittingModelMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffFittingModelMock.h
@@ -13,7 +13,7 @@
using namespace MantidQt::CustomInterfaces;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockEnggDiffFittingModel : public IEnggDiffFittingModel {
@@ -61,6 +61,6 @@ public:
MOCK_METHOD1(removeRun, void(const RunLabel &runLabel));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTID_CUSTOM_INTERFACES_ENGGDIFFFITTINGMODELMOCK_H
diff --git a/qt/scientific_interfaces/test/EnggDiffFittingViewMock.h b/qt/scientific_interfaces/test/EnggDiffFittingViewMock.h
index 1e7d4c1831f7b7c463af3ff491a5b9ba87103236..114f9f3285059c0addd0189a1db3c416e62da2cf 100644
--- a/qt/scientific_interfaces/test/EnggDiffFittingViewMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffFittingViewMock.h
@@ -6,7 +6,7 @@
#include <gmock/gmock.h>
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
// This is a simple mock for the tomo interface view when using SCARF.
class MockEnggDiffFittingView
@@ -162,6 +162,6 @@ public:
void(const std::vector<std::string> &rows));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTID_CUSTOMINTERFACES_ENGGDIFFFITTINGVIEWMOCK_H
diff --git a/qt/scientific_interfaces/test/EnggDiffGSASFittingModelMock.h b/qt/scientific_interfaces/test/EnggDiffGSASFittingModelMock.h
index 0a00dbfafaf3be5405dc90f5214b739c4bf1ad90..f58d44a4c6e9b0f611f065e30a0d3cc28fdb1272 100644
--- a/qt/scientific_interfaces/test/EnggDiffGSASFittingModelMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffGSASFittingModelMock.h
@@ -6,7 +6,7 @@
#include <gmock/gmock.h>
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
using namespace MantidQt::CustomInterfaces;
@@ -44,6 +44,6 @@ public:
void(boost::shared_ptr<IEnggDiffGSASFittingObserver> observer));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTID_CUSTOM_INTERFACES_ENGGDIFFFITTINGMODELMOCK_H_
diff --git a/qt/scientific_interfaces/test/EnggDiffGSASFittingViewMock.h b/qt/scientific_interfaces/test/EnggDiffGSASFittingViewMock.h
index 09f5e555c7c33ae3f450e7ba71dfe211d8f705df..f3501fac9aa8850abc5c06878342ce6dbacfd16d 100644
--- a/qt/scientific_interfaces/test/EnggDiffGSASFittingViewMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffGSASFittingViewMock.h
@@ -8,7 +8,7 @@
using namespace MantidQt::CustomInterfaces;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockEnggDiffGSASFittingView : public IEnggDiffGSASFittingView {
@@ -72,6 +72,6 @@ public:
const std::string &warningDescription));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTID_CUSTOMINTERFACES_ENGGDIFFGSASFITTINGVIEWMOCK_H_
diff --git a/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetModelMock.h b/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetModelMock.h
index 4b7377fd6e08b324c22411c4c6957183383c4d47..90bc996e71bc9f682ef9aa7371abb1866179d0f0 100644
--- a/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetModelMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetModelMock.h
@@ -8,7 +8,7 @@
using namespace MantidQt::CustomInterfaces;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockEnggDiffMultiRunFittingWidgetModel
: public IEnggDiffMultiRunFittingWidgetModel {
@@ -36,6 +36,6 @@ public:
MOCK_METHOD1(removeRun, void(const RunLabel &runLabel));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTIDQT_CUSTOMINTERFACES_ENGGDIFFMULTIRUNFITTINGWIDGETMODELMOCK_H_
diff --git a/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetPresenterMock.h b/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetPresenterMock.h
index 50337ef87189eedfc991c0a8ee79b8ef21119b24..5f5457f287427cac22b9606cce18854b6a7d60b5 100644
--- a/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetPresenterMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetPresenterMock.h
@@ -9,7 +9,7 @@
using namespace MantidQt::CustomInterfaces;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockEnggDiffMultiRunFittingWidgetPresenter
: public IEnggDiffMultiRunFittingWidgetPresenter {
@@ -48,6 +48,6 @@ MockEnggDiffMultiRunFittingWidgetPresenter::getWidgetAdder() const {
return Mantid::Kernel::make_unique<FakeEnggDiffMultiRunFittingWidgetAdder>();
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTIDQT_CUSTOMINTERFACES_ENGGDIFFMULTIRUNFITTINGWIDGETPRESENTERMOCK_H_
diff --git a/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetViewMock.h b/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetViewMock.h
index 6539ebe625d730eff67805ae8e305a163c321645..70d12470ded048b84fbac27316afa30b74194974 100644
--- a/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetViewMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffMultiRunFittingWidgetViewMock.h
@@ -8,7 +8,7 @@
using namespace MantidQt::CustomInterfaces;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
using namespace MantidQt::CustomInterfaces;
@@ -53,6 +53,6 @@ public:
MOCK_METHOD1(updateRunList, void(const std::vector<RunLabel> &runLabels));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTIDQT_CUSTOMINTERFACES_ENGGDIFFMULTIRUNFITTINGWIDGETVIEWMOCK_H_
diff --git a/qt/scientific_interfaces/test/EnggDiffractionParamMock.h b/qt/scientific_interfaces/test/EnggDiffractionParamMock.h
index d9fe717f15b6eaa73b48e10a875699633cf7132a..8ffa856047f3ace07d91f4603b389644367df55a 100644
--- a/qt/scientific_interfaces/test/EnggDiffractionParamMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffractionParamMock.h
@@ -6,7 +6,7 @@
#include <gmock/gmock.h>
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
using namespace MantidQt::CustomInterfaces;
@@ -20,6 +20,6 @@ public:
std::string(const std::vector<RunLabel> &runLabels));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTIDQTCUSTOMINTERFACES_ENGGDIFFRACTION_IENGGDIFFRACTIONPARAMMOCK_H_
diff --git a/qt/scientific_interfaces/test/EnggDiffractionViewMock.h b/qt/scientific_interfaces/test/EnggDiffractionViewMock.h
index bf69da05d53fdbae08cd693259d7826b177a826d..426384639c56c801c54c6524310a0fbfec22b274 100644
--- a/qt/scientific_interfaces/test/EnggDiffractionViewMock.h
+++ b/qt/scientific_interfaces/test/EnggDiffractionViewMock.h
@@ -8,7 +8,7 @@
class QwtData;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
// This is a simple mock for the tomo interface view when using SCARF.
class MockEnggDiffractionView
@@ -185,6 +185,6 @@ public:
// virtual void updateTabsInstrument(const std::string & newInstrument) = 0;
MOCK_METHOD1(updateTabsInstrument, void(const std::string &newInstrument));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif // MANTID_CUSTOMINTERFACES_ENGGDIFFRACTIONVIEWMOCK_H
diff --git a/qt/scientific_interfaces/test/MuonAnalysisFitDataPresenterTest.h b/qt/scientific_interfaces/test/MuonAnalysisFitDataPresenterTest.h
index 98bfaf2258929465bf23f85077de9df9aca3dcd5..2e7587cc88c10f03e28f3326583e636a9c80243d 100644
--- a/qt/scientific_interfaces/test/MuonAnalysisFitDataPresenterTest.h
+++ b/qt/scientific_interfaces/test/MuonAnalysisFitDataPresenterTest.h
@@ -51,7 +51,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
/// Mock data selector widget
class MockDataSelector : public IMuonFitDataSelector {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getFilenames, QStringList());
MOCK_CONST_METHOD0(getStartTime, double());
@@ -75,13 +75,13 @@ public:
MOCK_METHOD1(setDatasetNames, void(const QStringList &));
MOCK_CONST_METHOD0(getDatasetName, QString());
MOCK_METHOD0(askUserWhetherToOverwrite, bool());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
/// Mock fit property browser
class MockFitBrowser : public IWorkspaceFitControl, public IMuonFitDataModel {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(setWorkspaceName, void(const QString &));
MOCK_METHOD1(setStartX, void(double));
MOCK_METHOD1(setEndX, void(double));
@@ -99,7 +99,7 @@ public:
void preFitChecksRequested(bool sequential) override {
UNUSED_ARG(sequential);
}
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
class MuonAnalysisFitDataPresenterTest : public CxxTest::TestSuite {
diff --git a/qt/scientific_interfaces/test/MuonAnalysisFitFunctionPresenterTest.h b/qt/scientific_interfaces/test/MuonAnalysisFitFunctionPresenterTest.h
index 467a458e9a649af0a76384fab2b25eb7d68d2ba3..390ce9f21188088c9f37ae1015c09f5fcde2b2bf 100644
--- a/qt/scientific_interfaces/test/MuonAnalysisFitFunctionPresenterTest.h
+++ b/qt/scientific_interfaces/test/MuonAnalysisFitFunctionPresenterTest.h
@@ -25,7 +25,7 @@ public:
m_func =
Mantid::API::FunctionFactory::Instance().createFunction("Gaussian");
}
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(getFunctionString, QString());
Mantid::API::IFunction_sptr getGlobalFunction() override { return m_func; }
MOCK_METHOD0(functionStructureChanged, void());
@@ -46,7 +46,7 @@ public:
MOCK_METHOD3(setLocalParameterFixed, void(const QString &, int, bool));
MOCK_METHOD3(setLocalParameterTie, void(const QString &, int, QString));
MOCK_METHOD1(setCurrentDataset, void(int));
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
private:
Mantid::API::IFunction_sptr m_func;
@@ -55,7 +55,7 @@ private:
// Mock muon fit property browser
class MockFitFunctionControl : public IMuonFitFunctionModel {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(setFunction, void(const Mantid::API::IFunction_sptr));
MOCK_METHOD0(runFit, void());
MOCK_METHOD0(runSequentialFit, void());
@@ -70,7 +70,7 @@ public:
MOCK_METHOD0(doRemoveGuess, void());
MOCK_METHOD0(doPlotGuess, void());
MOCK_CONST_METHOD0(hasGuess, bool());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
class MuonAnalysisFitFunctionPresenterTest : public CxxTest::TestSuite {
diff --git a/qt/scientific_interfaces/test/ReflMeasureTransferStrategyTest.h b/qt/scientific_interfaces/test/ReflMeasureTransferStrategyTest.h
index 14c0d559a215f36ef4019df6df9ea0b1305a253a..f1cb3027523b972d7c967b17e18654d121fd823c 100644
--- a/qt/scientific_interfaces/test/ReflMeasureTransferStrategyTest.h
+++ b/qt/scientific_interfaces/test/ReflMeasureTransferStrategyTest.h
@@ -18,11 +18,11 @@ using namespace MantidQt::CustomInterfaces;
class MockReflMeasurementItemSource
: public MantidQt::CustomInterfaces::ReflMeasurementItemSource {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD2(obtain, MantidQt::CustomInterfaces::MeasurementItem(
const std::string &, const std::string &));
MOCK_CONST_METHOD0(clone, MockReflMeasurementItemSource *());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
class ReflMeasureTransferStrategyTest : public CxxTest::TestSuite {
diff --git a/qt/scientific_interfaces/test/ReflMockObjects.h b/qt/scientific_interfaces/test/ReflMockObjects.h
index 2e1e8beda45d5731a926edf7ba8c303ec763cca9..38dfce2f47f077dc5f8969b209d3a3f83acec3aa 100644
--- a/qt/scientific_interfaces/test/ReflMockObjects.h
+++ b/qt/scientific_interfaces/test/ReflMockObjects.h
@@ -32,7 +32,7 @@ using namespace MantidQt::CustomInterfaces;
using namespace Mantid::API;
using namespace MantidQt::MantidWidgets::DataProcessor;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
/**** Models ****/
@@ -385,6 +385,6 @@ public:
virtual ~MockReflAsciiSaver() = default;
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /*MANTID_CUSTOMINTERFACES_REFLMOCKOBJECTS_H*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h
index c1f69fd34f7f92a36d7c94bfa60c28e67edcf8c5..fa478e39529d8f06bfd56063ddb22aebe0075028 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h
@@ -29,7 +29,7 @@ const int ScaleCol = 7;
const int OptionsCol = 8;
const int HiddenOptionsCol = 9;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockDataProcessorView : public DataProcessorView {
public:
@@ -242,6 +242,6 @@ public:
};
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif /*MANTID_MANTIDWIDGETS_DATAPROCESSORVIEWMOCKOBJECTS_H*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProgressableViewMockObject.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProgressableViewMockObject.h
index 3c151f809af8b7874f1f1c0b51dcaa272559f144..7c028b53a9b6262fb7ab61522c563c11d232c344 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProgressableViewMockObject.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProgressableViewMockObject.h
@@ -10,11 +10,11 @@ using namespace MantidQt::MantidWidgets::DataProcessor;
class MockProgressableView : public ProgressableView {
public:
- GCC_DIAG_OFF_SUGGEST_OVERRIDE
+ DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(setProgress, void(int));
MOCK_METHOD2(setProgressRange, void(int, int));
MOCK_METHOD0(clearProgress, void());
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
};
#endif /* MANTID_MANTIDWIDGETS_PROGRESSABLEVIEWMOCKOBJECT_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h
index 2c7e37bfd83e6a5dafc5c456ceb99a80f23bf0de..48b60d7b1150804422e3deed73db678249b6121f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h
@@ -12,7 +12,7 @@
using namespace MantidQt::MantidWidgets;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockMantidDisplayBase;
@@ -103,6 +103,6 @@ public:
MOCK_METHOD1(notifyFromWorkspaceProvider, void(Flag flag));
};
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
-#endif // MANTIDQT_MANTIDWIDGETS_WORKSPACEDOCKMOCKOBJECTS_H
\ No newline at end of file
+#endif // MANTIDQT_MANTIDWIDGETS_WORKSPACEDOCKMOCKOBJECTS_H
diff --git a/qt/widgets/common/test/ProjectSaveMockObjects.h b/qt/widgets/common/test/ProjectSaveMockObjects.h
index bfda855a05641fe3f2dfcb1c88e793490794d09e..d9b293c272a8c63e86de63243c3db2b67e82d1e0 100644
--- a/qt/widgets/common/test/ProjectSaveMockObjects.h
+++ b/qt/widgets/common/test/ProjectSaveMockObjects.h
@@ -10,7 +10,7 @@
using namespace MantidQt::API;
using namespace MantidQt::MantidWidgets;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class MockProjectSaveView : public IProjectSaveView {
public:
diff --git a/qt/widgets/legacyqwt/test/SignalRangeTest.h b/qt/widgets/legacyqwt/test/SignalRangeTest.h
index fec9a6fcf5bf802540a3dc3aea6a86b8fa27ac3f..5f295ef58cbf394f03329191c3e507cbd27b3c01 100644
--- a/qt/widgets/legacyqwt/test/SignalRangeTest.h
+++ b/qt/widgets/legacyqwt/test/SignalRangeTest.h
@@ -12,7 +12,7 @@
#include "MantidAPI/IMDIterator.h"
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
class SignalRangeTest : public CxxTest::TestSuite {
private:
@@ -86,7 +86,7 @@ private:
MOCK_CONST_METHOD0(getLinearIndex, size_t());
MOCK_CONST_METHOD1(isWithinBounds, bool(size_t));
};
- GCC_DIAG_ON_SUGGEST_OVERRIDE
+ DIAG_ON_SUGGEST_OVERRIDE
class NormalizableMockIterator : public MockMDIterator {
public:
Mantid::signal_t getNormalizedSignal() const override {
diff --git a/qt/widgets/sliceviewer/test/MockObjects.h b/qt/widgets/sliceviewer/test/MockObjects.h
index 239adff69ef9d592dd74ed9a55eabf1e355f96ed..25c8d27b64137ec9e50ab6b9f4bb9a89d00e6d02 100644
--- a/qt/widgets/sliceviewer/test/MockObjects.h
+++ b/qt/widgets/sliceviewer/test/MockObjects.h
@@ -25,7 +25,7 @@ using namespace Mantid::Geometry;
using namespace Mantid;
using boost::regex;
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
+DIAG_OFF_SUGGEST_OVERRIDE
namespace {
/*------------------------------------------------------------
@@ -197,6 +197,6 @@ public:
};
}
-GCC_DIAG_ON_SUGGEST_OVERRIDE
+DIAG_ON_SUGGEST_OVERRIDE
#endif