From 34fec4a0c004b9bdbc04d97b87479614c84ef6b7 Mon Sep 17 00:00:00 2001 From: David Fairbrother <davidfair@users.noreply.github.com> Date: Fri, 9 Jun 2017 10:51:17 +0100 Subject: [PATCH] Fixed implicit missing imports --- Framework/Geometry/src/Instrument/FitParameter.cpp | 4 +++- .../src/Instrument/XMLInstrumentParameter.cpp | 1 + Framework/Geometry/src/Math/Acomp.cpp | 2 ++ Framework/Kernel/inc/MantidKernel/Material.h | 9 +++++---- Framework/Kernel/inc/MantidKernel/MaterialBuilder.h | 7 +++++++ Framework/Kernel/inc/MantidKernel/PropertyHistory.h | 2 ++ Framework/Kernel/inc/MantidKernel/PropertyNexus.h | 3 ++- Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h | 1 + Framework/Kernel/src/ConfigService.cpp | 1 + Framework/Kernel/src/DeltaEMode.cpp | 1 + Framework/Kernel/src/LogParser.cpp | 2 ++ Framework/Kernel/src/Matrix.cpp | 3 +++ Framework/Kernel/src/Memory.cpp | 1 + Framework/Kernel/src/MersenneTwister.cpp | 1 + Framework/Kernel/src/NeutronAtom.cpp | 1 + Framework/Kernel/src/PropertyManagerOwner.cpp | 1 + Framework/Kernel/src/PropertyWithValue.cpp | 1 + Framework/Kernel/src/Statistics.cpp | 12 +++++++----- Framework/Kernel/src/ThreadPool.cpp | 1 + Framework/Kernel/src/V2D.cpp | 4 +++- Framework/Kernel/test/MagneticFormFactorTableTest.h | 1 + Framework/Kernel/test/PropertyHistoryTest.h | 6 ++++-- Framework/Kernel/test/ThreadPoolTest.h | 2 ++ 23 files changed, 53 insertions(+), 14 deletions(-) diff --git a/Framework/Geometry/src/Instrument/FitParameter.cpp b/Framework/Geometry/src/Instrument/FitParameter.cpp index be35890a2c7..196afb8cadb 100644 --- a/Framework/Geometry/src/Instrument/FitParameter.cpp +++ b/Framework/Geometry/src/Instrument/FitParameter.cpp @@ -4,8 +4,10 @@ #include "MantidGeometry/Instrument/FitParameter.h" #include "MantidGeometry/Instrument/Parameter.h" #include "MantidGeometry/Instrument/ParameterFactory.h" -#include <MantidKernel/StringTokenizer.h> #include "MantidGeometry/muParser_Silent.h" +#include "MantidKernel/StringTokenizer.h" + +#include <boost/lexical_cast.hpp> namespace Mantid { namespace Geometry { diff --git a/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp b/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp index 9bb2a0f0e68..317b8056141 100644 --- a/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp +++ b/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp @@ -4,6 +4,7 @@ #include "MantidGeometry/Instrument/XMLInstrumentParameter.h" #include "MantidGeometry/IComponent.h" #include "MantidGeometry/muParser_Silent.h" +#include "MantidKernel/Exception.h" #include "MantidKernel/TimeSeriesProperty.h" #include "MantidKernel/LogParser.h" #include "MantidKernel/Logger.h" diff --git a/Framework/Geometry/src/Math/Acomp.cpp b/Framework/Geometry/src/Math/Acomp.cpp index 1661ec2ac96..1189d65a83f 100644 --- a/Framework/Geometry/src/Math/Acomp.cpp +++ b/Framework/Geometry/src/Math/Acomp.cpp @@ -4,7 +4,9 @@ #include "MantidKernel/Exception.h" #include "MantidKernel/Matrix.h" #include "MantidGeometry/Math/RotCounter.h" + #include <algorithm> +#include <iterator> #include <iostream> #include <functional> diff --git a/Framework/Kernel/inc/MantidKernel/Material.h b/Framework/Kernel/inc/MantidKernel/Material.h index 573be7fb051..4c262a99e6b 100644 --- a/Framework/Kernel/inc/MantidKernel/Material.h +++ b/Framework/Kernel/inc/MantidKernel/Material.h @@ -8,13 +8,14 @@ #include "MantidKernel/PhysicalConstants.h" #include <boost/shared_ptr.hpp> -namespace Mantid { - // Forward Declares - namespace NeXus { - class File; +// Forward Declares +namespace NeXus { + class File; } +namespace Mantid { + namespace PhysicalConstants { class Atom; } diff --git a/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h b/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h index abe72a69f6e..3b78718738d 100644 --- a/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h +++ b/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h @@ -7,7 +7,14 @@ #include <string> #include <tuple> + + namespace Mantid { +// Forward declare +namespace PhysicalConstants { +class NeutronAtom; +} + namespace Kernel { /** diff --git a/Framework/Kernel/inc/MantidKernel/PropertyHistory.h b/Framework/Kernel/inc/MantidKernel/PropertyHistory.h index f0c1bd5fe38..b5378096ed6 100644 --- a/Framework/Kernel/inc/MantidKernel/PropertyHistory.h +++ b/Framework/Kernel/inc/MantidKernel/PropertyHistory.h @@ -6,6 +6,8 @@ //---------------------------------------------------------------------- #include "MantidKernel/DllConfig.h" +#include <boost/shared_ptr.hpp> + #include <iosfwd> #include <string> #include <vector> diff --git a/Framework/Kernel/inc/MantidKernel/PropertyNexus.h b/Framework/Kernel/inc/MantidKernel/PropertyNexus.h index 73a512e28bb..becbf9fe612 100644 --- a/Framework/Kernel/inc/MantidKernel/PropertyNexus.h +++ b/Framework/Kernel/inc/MantidKernel/PropertyNexus.h @@ -2,9 +2,10 @@ #define MANTID_KERNEL_PROPERTYNEXUS_H_ #include "MantidKernel/System.h" +#include <memory> // Forward declare -namespace Nexus { +namespace NeXus { class File; } diff --git a/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h b/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h index f010d2b8c01..01f73ab9216 100644 --- a/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h +++ b/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h @@ -24,6 +24,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org> */ #include "MantidKernel/ClassMacros.h" +#include "MantidKernel/DllConfig.h" namespace Mantid { namespace Kernel { diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp index ce6ac553377..adebb99a45c 100644 --- a/Framework/Kernel/src/ConfigService.cpp +++ b/Framework/Kernel/src/ConfigService.cpp @@ -47,6 +47,7 @@ #include <algorithm> #include <exception> +#include <fstream> #include <functional> #include <iostream> #include <stdexcept> diff --git a/Framework/Kernel/src/DeltaEMode.cpp b/Framework/Kernel/src/DeltaEMode.cpp index 08a994366f9..67728e357b0 100644 --- a/Framework/Kernel/src/DeltaEMode.cpp +++ b/Framework/Kernel/src/DeltaEMode.cpp @@ -1,5 +1,6 @@ #include "MantidKernel/DeltaEMode.h" +#include <boost/algorithm/string/predicate.hpp> #include <map> #include <sstream> #include <stdexcept> diff --git a/Framework/Kernel/src/LogParser.cpp b/Framework/Kernel/src/LogParser.cpp index 1feb82d8916..0becfc1ffa7 100644 --- a/Framework/Kernel/src/LogParser.cpp +++ b/Framework/Kernel/src/LogParser.cpp @@ -7,6 +7,8 @@ #include "MantidKernel/PropertyWithValue.h" #include "MantidKernel/TimeSeriesProperty.h" +#include <fstream> + // constants for the new style icp event commands const char *START_COLLECTION = "START_COLLECTION"; const char *STOP_COLLECTION = "STOP_COLLECTION"; diff --git a/Framework/Kernel/src/Matrix.cpp b/Framework/Kernel/src/Matrix.cpp index 088cf78126d..43ef33a7c9f 100644 --- a/Framework/Kernel/src/Matrix.cpp +++ b/Framework/Kernel/src/Matrix.cpp @@ -1,8 +1,11 @@ #include "MantidKernel/Exception.h" #include "MantidKernel/Matrix.h" #include "MantidKernel/MersenneTwister.h" +#include "MantidKernel/TimeSeriesProperty.h" #include "MantidKernel/V3D.h" +#include <sstream> + using Mantid::Kernel::TimeSeriesProperty; namespace Mantid { diff --git a/Framework/Kernel/src/Memory.cpp b/Framework/Kernel/src/Memory.cpp index cc94ab71d88..98e99486c72 100644 --- a/Framework/Kernel/src/Memory.cpp +++ b/Framework/Kernel/src/Memory.cpp @@ -2,6 +2,7 @@ #include "MantidKernel/Logger.h" #include "MantidKernel/System.h" +#include <sstream> #include <stdio.h> #ifdef __linux__ diff --git a/Framework/Kernel/src/MersenneTwister.cpp b/Framework/Kernel/src/MersenneTwister.cpp index 8fd7629998c..472ee325c59 100644 --- a/Framework/Kernel/src/MersenneTwister.cpp +++ b/Framework/Kernel/src/MersenneTwister.cpp @@ -4,6 +4,7 @@ #include "MantidKernel/MersenneTwister.h" #include <boost/random/uniform_int_distribution.hpp> +#include <boost/random/uniform_real_distribution.hpp> #include <Poco/Timestamp.h> diff --git a/Framework/Kernel/src/NeutronAtom.cpp b/Framework/Kernel/src/NeutronAtom.cpp index 74015a61a89..f5c472d076d 100644 --- a/Framework/Kernel/src/NeutronAtom.cpp +++ b/Framework/Kernel/src/NeutronAtom.cpp @@ -7,6 +7,7 @@ #include <ostream> #include <string> #include <stdexcept> +#include <sstream> namespace Mantid { diff --git a/Framework/Kernel/src/PropertyManagerOwner.cpp b/Framework/Kernel/src/PropertyManagerOwner.cpp index 7bec1f3116b..3242c139bab 100644 --- a/Framework/Kernel/src/PropertyManagerOwner.cpp +++ b/Framework/Kernel/src/PropertyManagerOwner.cpp @@ -5,6 +5,7 @@ #include "MantidKernel/Property.h" #include "MantidKernel/PropertyManagerOwner.h" #include "MantidKernel/PropertyManager.h" +#include <json/json.h> #include <algorithm> namespace Mantid { diff --git a/Framework/Kernel/src/PropertyWithValue.cpp b/Framework/Kernel/src/PropertyWithValue.cpp index 991d02919a3..4825cd1e35c 100644 --- a/Framework/Kernel/src/PropertyWithValue.cpp +++ b/Framework/Kernel/src/PropertyWithValue.cpp @@ -1,4 +1,5 @@ #include "MantidKernel/PropertyWithValue.h" +#include "MantidKernel/Matrix.h" // PropertyWithValue implementation #include "MantidKernel/PropertyWithValue.tcc" diff --git a/Framework/Kernel/src/Statistics.cpp b/Framework/Kernel/src/Statistics.cpp index ac661642e71..cdf7078004f 100644 --- a/Framework/Kernel/src/Statistics.cpp +++ b/Framework/Kernel/src/Statistics.cpp @@ -1,17 +1,19 @@ // Includes #include "MantidKernel/Statistics.h" -#include <algorithm> -#include <cfloat> -#include <cmath> -#include <iostream> - #include <boost/accumulators/accumulators.hpp> #include <boost/accumulators/statistics/stats.hpp> #include <boost/accumulators/statistics/min.hpp> #include <boost/accumulators/statistics/max.hpp> #include <boost/accumulators/statistics/variance.hpp> +#include <algorithm> +#include <cfloat> +#include <cmath> +#include <iostream> +#include <sstream> + + namespace Mantid { namespace Kernel { diff --git a/Framework/Kernel/src/ThreadPool.cpp b/Framework/Kernel/src/ThreadPool.cpp index 2e877df9cea..f53232b6409 100644 --- a/Framework/Kernel/src/ThreadPool.cpp +++ b/Framework/Kernel/src/ThreadPool.cpp @@ -4,6 +4,7 @@ #include "MantidKernel/ThreadPool.h" #include "MantidKernel/ConfigService.h" +#include "MantidKernel/MultiThreaded.h" #include "MantidKernel/ProgressBase.h" #include "MantidKernel/Task.h" #include "MantidKernel/ThreadPoolRunnable.h" diff --git a/Framework/Kernel/src/V2D.cpp b/Framework/Kernel/src/V2D.cpp index 48667e146ea..b5b37e27ca8 100644 --- a/Framework/Kernel/src/V2D.cpp +++ b/Framework/Kernel/src/V2D.cpp @@ -1,7 +1,9 @@ +#include "MantidKernel/Exception.h" #include "MantidKernel/V2D.h" #include "MantidKernel/V3D.h" -#include "MantidKernel/Exception.h" + #include <limits> +#include <ostream> namespace Mantid { namespace Kernel { diff --git a/Framework/Kernel/test/MagneticFormFactorTableTest.h b/Framework/Kernel/test/MagneticFormFactorTableTest.h index 69e851b301e..1b2a5e2c258 100644 --- a/Framework/Kernel/test/MagneticFormFactorTableTest.h +++ b/Framework/Kernel/test/MagneticFormFactorTableTest.h @@ -3,6 +3,7 @@ #include <cxxtest/TestSuite.h> #include "MantidKernel/MagneticFormFactorTable.h" +#include "MantidKernel/MagneticIon.h" #include <boost/scoped_ptr.hpp> diff --git a/Framework/Kernel/test/PropertyHistoryTest.h b/Framework/Kernel/test/PropertyHistoryTest.h index 7c047918800..fa09873b510 100644 --- a/Framework/Kernel/test/PropertyHistoryTest.h +++ b/Framework/Kernel/test/PropertyHistoryTest.h @@ -1,11 +1,13 @@ #ifndef PROPERTYHISTORYTEST_H_ #define PROPERTYHISTORYTEST_H_ -#include <cxxtest/TestSuite.h> +#include "MantidKernel/EmptyValues.h" #include "MantidKernel/PropertyHistory.h" #include "MantidKernel/Property.h" -#include <sstream> + +#include <cxxtest/TestSuite.h> #include <boost/lexical_cast.hpp> +#include <sstream> using namespace Mantid::Kernel; diff --git a/Framework/Kernel/test/ThreadPoolTest.h b/Framework/Kernel/test/ThreadPoolTest.h index 910d407f1ab..b0872f59e74 100644 --- a/Framework/Kernel/test/ThreadPoolTest.h +++ b/Framework/Kernel/test/ThreadPoolTest.h @@ -10,6 +10,8 @@ #include "MantidKernel/ThreadScheduler.h" #include "MantidKernel/ThreadSchedulerMutexes.h" +#include <Poco/Thread.h> + #include <boost/bind.hpp> #include <boost/make_shared.hpp> #include <cstdlib> -- GitLab