From 40501f303362a80b4e54e59b19b8eaeb3709d10e Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 20 Aug 2018 14:30:35 +0100
Subject: [PATCH] Make more portable
---
Framework/Geometry/src/Rendering/ShapeInfo.cpp | 7 ++++---
Framework/Geometry/test/MeshObject2DTest.h | 4 ++--
Framework/NexusGeometry/test/NexusGeometryParserTest.h | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Framework/Geometry/src/Rendering/ShapeInfo.cpp b/Framework/Geometry/src/Rendering/ShapeInfo.cpp
index db425f775ef..3c80a043d0e 100644
--- a/Framework/Geometry/src/Rendering/ShapeInfo.cpp
+++ b/Framework/Geometry/src/Rendering/ShapeInfo.cpp
@@ -1,6 +1,7 @@
#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
\ No newline at end of file
+} // namespace Mantid
diff --git a/Framework/Geometry/test/MeshObject2DTest.h b/Framework/Geometry/test/MeshObject2DTest.h
index 96f2b75f9a0..732b51e7c58 100644
--- a/Framework/Geometry/test/MeshObject2DTest.h
+++ b/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
diff --git a/Framework/NexusGeometry/test/NexusGeometryParserTest.h b/Framework/NexusGeometry/test/NexusGeometryParserTest.h
index 48ffc3bc576..2ebeb707e99 100644
--- a/Framework/NexusGeometry/test/NexusGeometryParserTest.h
+++ b/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;
--
GitLab