From 78ce55517b2bc0bf066845b27fdf1f873e6a63c3 Mon Sep 17 00:00:00 2001 From: Stuart Campbell <campbellsi@ornl.gov> Date: Fri, 17 Apr 2015 08:07:25 -0400 Subject: [PATCH] fix some issues for rhel6 --- Code/Mantid/Framework/Kernel/src/MandatoryValidator.cpp | 1 + .../Kernel/src/Math/Optimization/SLSQPMinimizer.cpp | 1 + Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp | 1 + Code/Mantid/Framework/Kernel/src/NeutronAtom.cpp | 2 ++ Code/Mantid/Framework/Kernel/src/Statistics.cpp | 7 ++++++- Code/Mantid/Framework/Kernel/src/Strings.cpp | 1 + Code/Mantid/Framework/Kernel/src/Unit.cpp | 1 + Code/Mantid/Framework/Kernel/src/UnitConversion.cpp | 2 ++ Code/Mantid/Framework/Kernel/src/VectorHelper.cpp | 1 + 9 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Code/Mantid/Framework/Kernel/src/MandatoryValidator.cpp b/Code/Mantid/Framework/Kernel/src/MandatoryValidator.cpp index d94bc374489..18a470461ef 100644 --- a/Code/Mantid/Framework/Kernel/src/MandatoryValidator.cpp +++ b/Code/Mantid/Framework/Kernel/src/MandatoryValidator.cpp @@ -3,6 +3,7 @@ //------------------------------------------ #include "MantidKernel/MandatoryValidator.h" #include "MantidKernel/EmptyValues.h" +#include <cmath> namespace Mantid { namespace Kernel { diff --git a/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp b/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp index c0bb00ad7f1..07fcf2a7990 100644 --- a/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp +++ b/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp @@ -2,6 +2,7 @@ #include "MantidKernel/Exception.h" #include <algorithm> +#include <cmath> #include <cassert> #include <sstream> diff --git a/Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp b/Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp index 88f36d9be26..91665c120ff 100644 --- a/Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp +++ b/Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp @@ -6,6 +6,7 @@ #include "MantidKernel/ConfigService.h" #include "MantidKernel/FacilityInfo.h" +#include <numeric> #include <sstream> #include <boost/regex.hpp> diff --git a/Code/Mantid/Framework/Kernel/src/NeutronAtom.cpp b/Code/Mantid/Framework/Kernel/src/NeutronAtom.cpp index 867d8d6b415..03874b20567 100644 --- a/Code/Mantid/Framework/Kernel/src/NeutronAtom.cpp +++ b/Code/Mantid/Framework/Kernel/src/NeutronAtom.cpp @@ -2,9 +2,11 @@ // Includes //------------------------------------------------------------------------------ #include "MantidKernel/NeutronAtom.h" +#include "MantidKernel/PhysicalConstants.h" #include <algorithm> #include <iostream> // REMOVE #include <sstream> +#include <stdexcept> #include <boost/math/special_functions/fpclassify.hpp> namespace Mantid { diff --git a/Code/Mantid/Framework/Kernel/src/Statistics.cpp b/Code/Mantid/Framework/Kernel/src/Statistics.cpp index e41b01e8f00..795a1cc009b 100644 --- a/Code/Mantid/Framework/Kernel/src/Statistics.cpp +++ b/Code/Mantid/Framework/Kernel/src/Statistics.cpp @@ -2,9 +2,14 @@ #include "MantidKernel/Statistics.h" #include <algorithm> +#include <cfloat> +#include <cmath> #include <iostream> +#include <limits> +#include <numeric> #include <sstream> -#include <cfloat> +#include <stdexcept> + namespace Mantid { namespace Kernel { diff --git a/Code/Mantid/Framework/Kernel/src/Strings.cpp b/Code/Mantid/Framework/Kernel/src/Strings.cpp index f53b42a8c1d..c396f0e02c9 100644 --- a/Code/Mantid/Framework/Kernel/src/Strings.cpp +++ b/Code/Mantid/Framework/Kernel/src/Strings.cpp @@ -9,6 +9,7 @@ #include <boost/shared_ptr.hpp> #include <boost/make_shared.hpp> +#include <cmath> #include <fstream> #include <iomanip> diff --git a/Code/Mantid/Framework/Kernel/src/Unit.cpp b/Code/Mantid/Framework/Kernel/src/Unit.cpp index 23918d5ccbf..31275c764ad 100644 --- a/Code/Mantid/Framework/Kernel/src/Unit.cpp +++ b/Code/Mantid/Framework/Kernel/src/Unit.cpp @@ -7,6 +7,7 @@ #include "MantidKernel/UnitFactory.h" #include "MantidKernel/UnitLabelTypes.h" #include <cfloat> +#include <limits> namespace Mantid { namespace Kernel { diff --git a/Code/Mantid/Framework/Kernel/src/UnitConversion.cpp b/Code/Mantid/Framework/Kernel/src/UnitConversion.cpp index 8c9d536fa06..17bddd2832c 100644 --- a/Code/Mantid/Framework/Kernel/src/UnitConversion.cpp +++ b/Code/Mantid/Framework/Kernel/src/UnitConversion.cpp @@ -4,6 +4,8 @@ #include <boost/lexical_cast.hpp> +#include <cmath> + namespace Mantid { namespace Kernel { /** diff --git a/Code/Mantid/Framework/Kernel/src/VectorHelper.cpp b/Code/Mantid/Framework/Kernel/src/VectorHelper.cpp index 48cd715ab8e..cb08b58efed 100644 --- a/Code/Mantid/Framework/Kernel/src/VectorHelper.cpp +++ b/Code/Mantid/Framework/Kernel/src/VectorHelper.cpp @@ -4,6 +4,7 @@ #include "MantidKernel/VectorHelper.h" #include <algorithm> #include <iostream> +#include <numeric> #include <sstream> #include <boost/algorithm/string.hpp> -- GitLab