From aef8a66099edc9f5886901ac764857a4e6322d06 Mon Sep 17 00:00:00 2001
From: Gerardo Tauriello <gerardo.tauriello@unibas.ch>
Date: Mon, 30 Sep 2019 19:31:18 +0200
Subject: [PATCH] SCHWED-4328: clean up Boost includes
---
modules/base/pymod/export_logger.cc | 1 +
modules/base/src/boost_filesystem_helper.hh | 1 +
modules/base/tests/test_string_ref.cc | 1 -
modules/geom/src/vec_mat_predicates.hh | 6 +++++-
modules/geom/tests/test_composite3.cc | 1 -
modules/geom/tests/test_quat.cc | 1 -
modules/gfx/tests/test_color.cc | 1 -
modules/img/alg/tests/test_normalizer.cc | 6 ++++++
modules/io/tests/test_io_img.cc | 6 ++++++
modules/io/tests/test_io_pdb.cc | 1 -
modules/io/tests/test_io_sdf.cc | 1 -
modules/io/tests/test_mmcif_info.cc | 1 -
modules/io/tests/test_mmcif_reader.cc | 1 -
modules/io/tests/test_star_parser.cc | 1 -
modules/mol/base/pymod/export_entity_view.cc | 1 +
modules/mol/base/tests/test_ics.cc | 1 -
modules/seq/alg/tests/test_sequence_identity.cc | 1 -
17 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/modules/base/pymod/export_logger.cc b/modules/base/pymod/export_logger.cc
index 41433a40a..1434b4f67 100644
--- a/modules/base/pymod/export_logger.cc
+++ b/modules/base/pymod/export_logger.cc
@@ -18,6 +18,7 @@
//------------------------------------------------------------------------------
#include <boost/python.hpp>
#include <boost/python/raw_function.hpp>
+#include <boost/version.hpp>
#if BOOST_VERSION<103400
#include <boost/python/detail/api_placeholder.hpp>
#endif
diff --git a/modules/base/src/boost_filesystem_helper.hh b/modules/base/src/boost_filesystem_helper.hh
index 450ffa94d..03a9786e7 100644
--- a/modules/base/src/boost_filesystem_helper.hh
+++ b/modules/base/src/boost_filesystem_helper.hh
@@ -24,6 +24,7 @@
#define OST_BOOST_FILESYSTEM_HELPER_HH
#include <boost/filesystem/path.hpp>
+#include <boost/version.hpp>
namespace {
diff --git a/modules/base/tests/test_string_ref.cc b/modules/base/tests/test_string_ref.cc
index 539440d17..7ef5b6776 100644
--- a/modules/base/tests/test_string_ref.cc
+++ b/modules/base/tests/test_string_ref.cc
@@ -23,7 +23,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include <ost/string_ref.hh>
using namespace ost;
diff --git a/modules/geom/src/vec_mat_predicates.hh b/modules/geom/src/vec_mat_predicates.hh
index 7f897a509..bbe639f3b 100644
--- a/modules/geom/src/vec_mat_predicates.hh
+++ b/modules/geom/src/vec_mat_predicates.hh
@@ -18,9 +18,13 @@
//------------------------------------------------------------------------------
#ifndef OST_GEOM_VEC_MAT_PREDICATES_HH
#define OST_GEOM_VEC_MAT_PREDICATES_HH
-#include <boost/version.hpp>
#include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION<105900
#include <boost/test/floating_point_comparison.hpp>
+#else
+#include <boost/test/tools/floating_point_comparison.hpp>
+#endif
#include <ost/geom/geom.hh>
diff --git a/modules/geom/tests/test_composite3.cc b/modules/geom/tests/test_composite3.cc
index 31479351c..48309acd0 100644
--- a/modules/geom/tests/test_composite3.cc
+++ b/modules/geom/tests/test_composite3.cc
@@ -23,7 +23,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include "helper.hh"
using namespace geom;
diff --git a/modules/geom/tests/test_quat.cc b/modules/geom/tests/test_quat.cc
index b4228dc38..158f44d1e 100644
--- a/modules/geom/tests/test_quat.cc
+++ b/modules/geom/tests/test_quat.cc
@@ -21,7 +21,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include "helper.hh"
using namespace geom;
diff --git a/modules/gfx/tests/test_color.cc b/modules/gfx/tests/test_color.cc
index 26784b4cc..21f82f2c3 100644
--- a/modules/gfx/tests/test_color.cc
+++ b/modules/gfx/tests/test_color.cc
@@ -25,7 +25,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
using boost::unit_test_framework::test_suite;
diff --git a/modules/img/alg/tests/test_normalizer.cc b/modules/img/alg/tests/test_normalizer.cc
index 205a5a5b3..2b13c649f 100644
--- a/modules/img/alg/tests/test_normalizer.cc
+++ b/modules/img/alg/tests/test_normalizer.cc
@@ -25,6 +25,12 @@
#include <iostream>
#include "tests.hh"
+#include <boost/version.hpp>
+#if BOOST_VERSION<105900
+#include <boost/test/floating_point_comparison.hpp>
+#else
+#include <boost/test/tools/floating_point_comparison.hpp>
+#endif
#include <ost/img/image.hh>
#include <ost/img/alg/normalizer_factory.hh>
diff --git a/modules/io/tests/test_io_img.cc b/modules/io/tests/test_io_img.cc
index 2e7b4961c..11821e11f 100644
--- a/modules/io/tests/test_io_img.cc
+++ b/modules/io/tests/test_io_img.cc
@@ -18,6 +18,12 @@
//------------------------------------------------------------------------------
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION<105900
+#include <boost/test/floating_point_comparison.hpp>
+#else
+#include <boost/test/tools/floating_point_comparison.hpp>
+#endif
#include <map>
#include <ost/io/img/load_map.hh>
diff --git a/modules/io/tests/test_io_pdb.cc b/modules/io/tests/test_io_pdb.cc
index 4eb4cb19b..4cfc22492 100644
--- a/modules/io/tests/test_io_pdb.cc
+++ b/modules/io/tests/test_io_pdb.cc
@@ -18,7 +18,6 @@
//------------------------------------------------------------------------------
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
using boost::unit_test_framework::test_suite;
#include <ost/test_utils/compare_files.hh>
diff --git a/modules/io/tests/test_io_sdf.cc b/modules/io/tests/test_io_sdf.cc
index b15b4f6e7..1aa5faf28 100644
--- a/modules/io/tests/test_io_sdf.cc
+++ b/modules/io/tests/test_io_sdf.cc
@@ -18,7 +18,6 @@
//------------------------------------------------------------------------------
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
using boost::unit_test_framework::test_suite;
diff --git a/modules/io/tests/test_mmcif_info.cc b/modules/io/tests/test_mmcif_info.cc
index 28c165c80..19c091f35 100644
--- a/modules/io/tests/test_mmcif_info.cc
+++ b/modules/io/tests/test_mmcif_info.cc
@@ -19,7 +19,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include <ost/io/io_exception.hh>
#include <ost/io/mol/mmcif_info.hh>
diff --git a/modules/io/tests/test_mmcif_reader.cc b/modules/io/tests/test_mmcif_reader.cc
index 87e844f72..2711bddcf 100644
--- a/modules/io/tests/test_mmcif_reader.cc
+++ b/modules/io/tests/test_mmcif_reader.cc
@@ -19,7 +19,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include <fstream>
#include <ost/platform.hh>
diff --git a/modules/io/tests/test_star_parser.cc b/modules/io/tests/test_star_parser.cc
index 8024025a5..86edfe272 100644
--- a/modules/io/tests/test_star_parser.cc
+++ b/modules/io/tests/test_star_parser.cc
@@ -21,7 +21,6 @@
*/
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include <fstream>
#include <math.h>
diff --git a/modules/mol/base/pymod/export_entity_view.cc b/modules/mol/base/pymod/export_entity_view.cc
index 19781a94f..fb969ce46 100644
--- a/modules/mol/base/pymod/export_entity_view.cc
+++ b/modules/mol/base/pymod/export_entity_view.cc
@@ -18,6 +18,7 @@
//------------------------------------------------------------------------------
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#include <boost/version.hpp>
#if BOOST_VERSION<103400
#include <boost/python/detail/api_placeholder.hpp>
#endif
diff --git a/modules/mol/base/tests/test_ics.cc b/modules/mol/base/tests/test_ics.cc
index a68d49734..73358b98d 100644
--- a/modules/mol/base/tests/test_ics.cc
+++ b/modules/mol/base/tests/test_ics.cc
@@ -21,7 +21,6 @@
*/
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include <ost/mol/mol.hh>
#include <ost/log.hh>
#include <ost/message.hh>
diff --git a/modules/seq/alg/tests/test_sequence_identity.cc b/modules/seq/alg/tests/test_sequence_identity.cc
index d95d5a671..87bd3f33e 100644
--- a/modules/seq/alg/tests/test_sequence_identity.cc
+++ b/modules/seq/alg/tests/test_sequence_identity.cc
@@ -22,7 +22,6 @@
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include <ost/seq/alg/sequence_identity.hh>
--
GitLab