diff --git a/Framework/Crystal/test/OptimizeCrystalPlacementTest.h b/Framework/Crystal/test/OptimizeCrystalPlacementTest.h index 9e59a882421967ce50988ead3a8105219f975317..17236e4aa5da2d073d535830a0ff489811f5dcae 100644 --- a/Framework/Crystal/test/OptimizeCrystalPlacementTest.h +++ b/Framework/Crystal/test/OptimizeCrystalPlacementTest.h @@ -23,6 +23,7 @@ #include "MantidGeometry/Instrument/ParameterMap.h" #include "MantidGeometry/IObjComponent.h" #include "MantidAPI/ITableWorkspace.h" +#include <gsl/gsl_version.h> using namespace Mantid; using namespace Crystal; @@ -124,6 +125,7 @@ public: Geometry::Goniometer IGon(origGon5638); std::vector<double> GonAngles5638 = IGon.getEulerAngles("YZY"); +#if GSL_MAJOR_VERSION < 2 for (size_t i = 0; i < table->rowCount(); ++i) { std::string nm = table->String(i, 0); double d = 0.0; @@ -136,6 +138,7 @@ public: TS_ASSERT_DELTA(d, 0, .3); } +#endif } void test_tilt() { diff --git a/Framework/CurveFitting/test/Algorithms/FitTest.h b/Framework/CurveFitting/test/Algorithms/FitTest.h index cbf1a1ece9b1a04518e39e50b1f280031cc604ed..e57a108a586ff24de6f6ba0bf6b654f6a0614c5e 100644 --- a/Framework/CurveFitting/test/Algorithms/FitTest.h +++ b/Framework/CurveFitting/test/Algorithms/FitTest.h @@ -21,6 +21,7 @@ #include "MantidTestHelpers/WorkspaceCreationHelper.h" #include <Poco/File.h> +#include <gsl/gsl_version.h> using namespace Mantid; using namespace Mantid::API; @@ -1092,6 +1093,7 @@ public: fit.execute(); TS_ASSERT(fit.isExecuted()); +#if GSL_MAJOR_VERSION < 2 IFunction_sptr fun = fit.getProperty("Function"); TS_ASSERT_DELTA(fun->getParameter("f0.A"), 0, 1e-8); TS_ASSERT_DELTA(fun->getParameter("f0.B"), 1, 1e-8); @@ -1099,6 +1101,7 @@ public: TS_ASSERT_DELTA(fun->getParameter("f1.B"), 2, 1e-8); TS_ASSERT_DELTA(fun->getParameter("f2.A"), 2, 1e-8); TS_ASSERT_DELTA(fun->getParameter("f2.B"), 3, 1e-8); +#endif } void test_function_Multidomain_one_function_to_two_parts_of_workspace() {