Make more portable

Framework/Geometry/src/Rendering/ShapeInfo.cpp

 #include "MantidGeometry/Rendering/ShapeInfo.h"
 #include "MantidKernel/Tolerance.h"
 #include "MantidKernel/V3D.h"
+#include <cmath>
 
 namespace Mantid {
 using Kernel::V3D;
@@ -67,11 +68,11 @@ void ShapeInfo::setCone(const V3D &c, const V3D &a, double r, double h) {
 
 bool ShapeInfo::operator==(const ShapeInfo &other) {
   return m_shape == other.m_shape &&
-         abs(m_height - other.m_height) < Kernel::Tolerance &&
-         abs(m_radius - other.m_radius) < Kernel::Tolerance &&
+         std::abs(m_height - other.m_height) < Kernel::Tolerance &&
+         std::abs(m_radius - other.m_radius) < Kernel::Tolerance &&
          m_points == other.m_points;
 }
 
 } // namespace detail
 } // namespace Geometry
-} // namespace Mantid
+} // namespace Mantid
\ No newline at end of file

Framework/Geometry/test/MeshObject2DTest.h

@@ -41,7 +41,7 @@ MeshObject2D makeTrapezoidMesh(const V3D &a, const V3D &b, const V3D &c,
 // -----------------------------------------------------------------------------
 class MockRNG : public Mantid::Kernel::PseudoRandomNumberGenerator {
 public:
-  GCC_DIAG_OFF_SUGGEST_OVERRIDE
+  GNU_DIAG_OFF_SUGGEST_OVERRIDE
   MOCK_METHOD0(nextValue, double());
   MOCK_METHOD2(nextValue, double(double, double));
   MOCK_METHOD2(nextInt, int(int, int));
@@ -52,7 +52,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
+  GNU_DIAG_ON_SUGGEST_OVERRIDE
 };
 } // namespace
 

Framework/NexusGeometry/test/NexusGeometryParserTest.h

@@ -18,6 +18,7 @@
 #include <H5Cpp.h>
 #include <chrono>
 #include <string>
+#include <Poco/Glob.h>
 
 using namespace Mantid;
 using namespace NexusGeometry;