From a22ac8e3d0f6fead27e7209c2dc4f6232d24c62f Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 9 Feb 2015 17:49:09 +0000
Subject: [PATCH] refs #10904. Fix windows build.
---
.../DataObjects/test/PeakShapeEllipsoidFactoryTest.h | 1 +
.../DataObjects/test/PeakShapeEllipsoidTest.h | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h
index 6f47715e5ba..1a42dc4db3e 100644
--- a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h
+++ b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h
@@ -22,6 +22,7 @@ using namespace Mantid;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
using namespace boost::assign;
+using Mantid::Kernel::SpecialCoordinateSystem;
class PeakShapeEllipsoidFactoryTest : public CxxTest::TestSuite {
public:
diff --git a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h
index d22daf414d8..d844798a825 100644
--- a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h
+++ b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h
@@ -31,7 +31,7 @@ public:
const MantidVec abcRadii = list_of(2)(3)(4);
const MantidVec abcInnerRadii = list_of(5)(6)(7);
const MantidVec abcOuterRadii = list_of(8)(9)(10);
- const SpecialCoordinateSystem frame = HKL;
+ const SpecialCoordinateSystem frame = Mantid::Kernel::HKL;
const std::string algorithmName = "foo";
const int algorithmVersion = 3;
@@ -59,7 +59,7 @@ public:
const MantidVec bad_abcInnerRadii = list_of(5)(6);
const MantidVec abcOuterRadii = list_of(8)(9)(10);
const MantidVec bad_abcOuterRadii = list_of(8)(9)(10)(11);
- const SpecialCoordinateSystem frame = HKL;
+ const SpecialCoordinateSystem frame = Mantid::Kernel::HKL;
TSM_ASSERT_THROWS("Should throw, bad directions",
PeakShapeEllipsoid(bad_directions, abcRadii,
@@ -86,7 +86,7 @@ public:
const MantidVec abcRadii = list_of(2)(3)(4);
const MantidVec abcInnerRadii = list_of(5)(6)(7);
const MantidVec abcOuterRadii = list_of(8)(9)(10);
- const SpecialCoordinateSystem frame = HKL;
+ const SpecialCoordinateSystem frame = Mantid::Kernel::HKL;
const std::string algorithmName = "foo";
const int algorithmVersion = 3;
@@ -108,7 +108,7 @@ public:
PeakShapeEllipsoid a(list_of(V3D(1, 0, 0))(V3D(0, 1, 0))(V3D(0, 0, 1))
.convert_to_container<std::vector<V3D>>(),
list_of(2)(3)(4), list_of(5)(6)(7), list_of(8)(9)(10),
- HKL, "foo", 1);
+ Mantid::Kernel::HKL, "foo", 1);
PeakShapeEllipsoid b(list_of(V3D(0, 0, 0))(V3D(0, 1, 0))(V3D(0, 0, 1))
.convert_to_container<std::vector<V3D>>(),
@@ -132,7 +132,7 @@ public:
PeakShapeEllipsoid shape(list_of(V3D(1, 0, 0))(V3D(0, 1, 0))(V3D(0, 0, 1))
.convert_to_container<std::vector<V3D>>(),
list_of(2)(3)(4), list_of(5)(6)(7),
- list_of(8)(9)(10), HKL, "foo", 1);
+ list_of(8)(9)(10), Mantid::Kernel::HKL, "foo", 1);
TS_ASSERT_EQUALS("ellipsoid", shape.shapeName());
}
@@ -144,7 +144,7 @@ public:
const MantidVec abcRadii = list_of(2)(3)(4);
const MantidVec abcInnerRadii = list_of(5)(6)(7);
const MantidVec abcOuterRadii = list_of(8)(9)(10);
- const SpecialCoordinateSystem frame = HKL;
+ const SpecialCoordinateSystem frame = Mantid::Kernel::HKL;
const std::string algorithmName = "foo";
const int algorithmVersion = 3;
--
GitLab