OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: adjust include path of float_point_comparison for earlier boost

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-11-10 10:17:23 +01:00
parent e2c20a6712
commit f8781f276e
6 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/material/test_components.cpp
View File

@ -31,7 +31,13 @@
#define BOOST_TEST_MODULE Components #define BOOST_TEST_MODULE Components
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
#include <boost/test/floating_point_comparison.hpp>
#else
#include <boost/test/tools/floating_point_comparison.hpp> #include <boost/test/tools/floating_point_comparison.hpp>
#endif
#include <opm/material/densead/Evaluation.hpp> #include <opm/material/densead/Evaluation.hpp>
#include <opm/material/densead/Math.hpp> #include <opm/material/densead/Math.hpp>

6
tests/parser/ACTIONX.cpp
View File

@ -23,7 +23,13 @@
#define BOOST_TEST_MODULE ACTIONX #define BOOST_TEST_MODULE ACTIONX
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
#include <boost/test/floating_point_comparison.hpp>
#else
#include <boost/test/tools/floating_point_comparison.hpp> #include <boost/test/tools/floating_point_comparison.hpp>
#endif
#include <opm/common/utility/TimeService.hpp> #include <opm/common/utility/TimeService.hpp>
#include <opm/common/utility/OpmInputError.hpp> #include <opm/common/utility/OpmInputError.hpp>

5
tests/parser/FieldPropsTests.cpp
View File

@ -28,7 +28,12 @@
#define BOOST_TEST_MODULE FieldPropsTests #define BOOST_TEST_MODULE FieldPropsTests
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
#include <boost/test/floating_point_comparison.hpp>
#else
#include <boost/test/tools/floating_point_comparison.hpp> #include <boost/test/tools/floating_point_comparison.hpp>
#endif
#include <opm/common/utility/OpmInputError.hpp> #include <opm/common/utility/OpmInputError.hpp>

6
tests/parser/ScheduleTests.cpp
View File

@ -29,7 +29,13 @@
#define BOOST_TEST_MODULE ScheduleTests #define BOOST_TEST_MODULE ScheduleTests
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
#include <boost/test/floating_point_comparison.hpp>
#else
#include <boost/test/tools/floating_point_comparison.hpp> #include <boost/test/tools/floating_point_comparison.hpp>
#endif
#include <opm/common/utility/ActiveGridCells.hpp> #include <opm/common/utility/ActiveGridCells.hpp>
#include <opm/common/utility/TimeService.hpp> #include <opm/common/utility/TimeService.hpp>

6
tests/test_nonuniformtablelinear.cpp
View File

@ -24,7 +24,13 @@
#define BOOST_TEST_MODULE NonuniformTableLinearTests #define BOOST_TEST_MODULE NonuniformTableLinearTests
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
#include <boost/test/floating_point_comparison.hpp>
#else
#include <boost/test/tools/floating_point_comparison.hpp> #include <boost/test/tools/floating_point_comparison.hpp>
#endif
#include <opm/common/utility/numeric/NonuniformTableLinear.hpp> #include <opm/common/utility/numeric/NonuniformTableLinear.hpp>

8
tests/test_uniformtablelinear.cpp
View File

@ -23,11 +23,15 @@
#define BOOST_TEST_MODULE UniformTableLinearTests #define BOOST_TEST_MODULE UniformTableLinearTests
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
#include <boost/test/floating_point_comparison.hpp>
#else
#include <boost/test/tools/floating_point_comparison.hpp> #include <boost/test/tools/floating_point_comparison.hpp>
#endif
#include <opm/common/utility/numeric/UniformTableLinear.hpp> #include <opm/common/utility/numeric/UniformTableLinear.hpp>
BOOST_AUTO_TEST_CASE(table_operations) BOOST_AUTO_TEST_CASE(table_operations)
{ {
// Make a simple table. // Make a simple table.