Remove more checks for old boost versions

library/LibUtilities/Interpreter/AnalyticExpressionEvaluator.cpp

@@ -42,11 +42,7 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/random/detail/seed.hpp>
 
-#if( BOOST_VERSION / 100 % 1000 >= 36 )
 using namespace boost::spirit::classic;
-#else
-using namespace boost::spirit;
-#endif
 
 // trying to avoid incompatibility between standart <algorithm> header and
 // windows.h header which defines max and min macros.

library/LibUtilities/Interpreter/AnalyticExpressionEvaluator.hpp

@@ -48,7 +48,6 @@
 #include <boost/math/special_functions/bessel.hpp>
 
 #define BOOST_SPIRIT_THREADSAFE
-#if( BOOST_VERSION / 100 % 1000 >= 36 )
 #include <boost/spirit/include/classic_core.hpp>
 #include <boost/spirit/include/classic_ast.hpp>
 #include <boost/spirit/include/classic_symbols.hpp>
@@ -56,15 +55,6 @@
 #include <boost/spirit/include/classic_push_back_actor.hpp>
 
 namespace boost_spirit = boost::spirit::classic;
-#else
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/symbols/symbols.hpp>
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-
-namespace boost_spirit = boost::spirit;
-#endif
 
 #include <string>
 #include <vector>

library/LibUtilities/LinearAlgebra/ExplicitInstantiation.h

@@ -52,9 +52,7 @@
 
 #include <LibUtilities/LinearAlgebra/NekTypeDefs.hpp>
 
-#if BOOST_VERSION > 104800
 #define BOOST_PP_TUPLE_REM_0()
-#endif
 
 // Macros to make creating explicit instantiations of all possible matrix types for methods easier.
 #define NEKTAR_ALL_MATRIX_TYPES (6, (const DNekMat&, const DNekScalMat&, const DNekBlkMat&, const BlkMatDNekBlkMat&, const DNekScalBlkMat&, const BlkMatDNekScalBlkMat&))

library/Timings/TimingCGGeneralMatrixOp3D.cpp

@@ -530,11 +530,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-    #if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-    #else
-    return temp.file_string();
-    #endif
-
 }

library/Timings/TimingCGHelmSolve2D.cpp

@@ -421,12 +421,7 @@ int main(int argc, char *argv[])
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-#if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-#else
-    return temp.file_string();
-#endif
-
 }
 

library/Timings/TimingCGHelmSolve3D.cpp

@@ -427,12 +427,7 @@ int main(int argc, char *argv[])
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-#if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-#else
-    return temp.file_string();
-#endif
-
 }
 

library/Timings/TimingGeneralMatrixOp2D.cpp

@@ -482,11 +482,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-    #if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-    #else
-    return temp.file_string();
-    #endif
-
 }

library/Timings/TimingGeneralMatrixOp3D.cpp

@@ -471,11 +471,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-    #if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-    #else
-    return temp.file_string();
-    #endif
-
 }

library/Timings/TimingHDGHelmSolve2D.cpp

@@ -504,11 +504,6 @@ int main(int argc, char *argv[])
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-#if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-#else
-    return temp.file_string();
-#endif
-
 }

library/Timings/TimingHDGHelmSolve3D.cpp

@@ -513,11 +513,6 @@ int main(int argc, char *argv[])
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-#if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-#else
-    return temp.file_string();
-#endif
-
 }

solvers/VortexWaveInteraction/VortexWaveInteractionSolver.cpp

@@ -38,7 +38,7 @@
 using namespace std;
 using namespace Nektar;
 
-#if defined(_MSC_VER) && BOOST_VERSION > 104700
+#if defined(_MSC_VER)
 #include <windows.h>
 #undef MoveFile
 #endif

tests/TestData.cpp

@@ -48,11 +48,8 @@ namespace Nektar
             : m_cmdoptions(pVm)
     {
         // Process test file format.
-#if BOOST_VERSION > 104200
         m_doc = new TiXmlDocument(pFilename.string().c_str());
-#else
-        m_doc = new TiXmlDocument(pFilename.file_string().c_str());
-#endif
+
         bool loadOkay = m_doc->LoadFile();
 
         ASSERTL0(loadOkay, "Failed to load test definition file: "

tests/Tester.cpp.in

@@ -55,12 +55,8 @@ namespace po = boost::program_options;
 std::string PortablePath(const boost::filesystem::path& path)
 {
     boost::filesystem::path temp = path;
-#if BOOST_VERSION > 104200
     temp.make_preferred();
     return temp.string();
-#else
-    return temp.file_string();
-#endif
 }
 
 int main(int argc, char *argv[])
@@ -132,11 +128,7 @@ int main(int argc, char *argv[])
         specPath = fs::current_path();
     }
 
-#if BOOST_VERSION > 104200
     string specFileStem = specFile.stem().string();
-#else
-    string specFileStem = specFile.stem();
-#endif
 
     // Temporary directory to create and in which to conduct test
     const fs::path tmpDir = fs::current_path()