Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
0e0f73ea
Commit
0e0f73ea
authored
Sep 21, 2017
by
Douglas Serson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove more checks for old boost versions
parent
5133f68e
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
2 additions
and
64 deletions
+2
-64
library/LibUtilities/Interpreter/AnalyticExpressionEvaluator.cpp
.../LibUtilities/Interpreter/AnalyticExpressionEvaluator.cpp
+0
-4
library/LibUtilities/Interpreter/AnalyticExpressionEvaluator.hpp
.../LibUtilities/Interpreter/AnalyticExpressionEvaluator.hpp
+0
-10
library/LibUtilities/LinearAlgebra/ExplicitInstantiation.h
library/LibUtilities/LinearAlgebra/ExplicitInstantiation.h
+0
-2
library/Timings/TimingCGGeneralMatrixOp3D.cpp
library/Timings/TimingCGGeneralMatrixOp3D.cpp
+0
-5
library/Timings/TimingCGHelmSolve2D.cpp
library/Timings/TimingCGHelmSolve2D.cpp
+0
-5
library/Timings/TimingCGHelmSolve3D.cpp
library/Timings/TimingCGHelmSolve3D.cpp
+0
-5
library/Timings/TimingGeneralMatrixOp2D.cpp
library/Timings/TimingGeneralMatrixOp2D.cpp
+0
-5
library/Timings/TimingGeneralMatrixOp3D.cpp
library/Timings/TimingGeneralMatrixOp3D.cpp
+0
-5
library/Timings/TimingHDGHelmSolve2D.cpp
library/Timings/TimingHDGHelmSolve2D.cpp
+0
-5
library/Timings/TimingHDGHelmSolve3D.cpp
library/Timings/TimingHDGHelmSolve3D.cpp
+0
-5
solvers/VortexWaveInteraction/VortexWaveInteractionSolver.cpp
...ers/VortexWaveInteraction/VortexWaveInteractionSolver.cpp
+1
-1
tests/TestData.cpp
tests/TestData.cpp
+1
-4
tests/Tester.cpp.in
tests/Tester.cpp.in
+0
-8
No files found.
library/LibUtilities/Interpreter/AnalyticExpressionEvaluator.cpp
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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
View file @
0e0f73ea
...
...
@@ -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()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment