From bd4222cc846d25c16128d3ffcd898ebf55d386fb Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 11 Jan 2019 10:58:38 +0100 Subject: [PATCH] qa test: fix a compil issue by modifying the way BOOST_PRINT namespace is used in geometry.h --- qa/unit_test_utils/include/unit_test_utils/geometry.h | 7 +++++-- .../include/unit_test_utils/unit_test_utils.h | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/qa/unit_test_utils/include/unit_test_utils/geometry.h b/qa/unit_test_utils/include/unit_test_utils/geometry.h index cc10cd3814..42d10ae459 100644 --- a/qa/unit_test_utils/include/unit_test_utils/geometry.h +++ b/qa/unit_test_utils/include/unit_test_utils/geometry.h @@ -8,17 +8,20 @@ #include #include + /** * Printer for BOX2I type */ -template <> struct BOOST_PRINT::print_log_value +namespace BOOST_PRINT_NAMESPACE +{ +template <> struct print_log_value { void operator()( std::ostream& os, const BOX2I& aBox ) { os << "BOX[ " << aBox.GetOrigin() << " + " << aBox.GetSize() << " ]"; } }; - +} // namespace BOOST_PRINT_NAMESPACE namespace KI_TEST { diff --git a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h index 9e54e0fbb4..a355f947c5 100644 --- a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h +++ b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h @@ -81,12 +81,15 @@ * Define a helper to make it easier to use the right namespace for * defining the print helpers like this: * - * template<> - * struct BOOST_PRINT::print_log_value< MY_TYPE > + * namespace BOOST_PRINT_NAMESPACE + * { + * template<> + * struct print_log_value< MY_TYPE > + * } */ #if BOOST_VERSION < 105900 -namespace BOOST_PRINT = boost::test_tools; + #define BOOST_PRINT_NAMESPACE boost::test_tools #else -namespace BOOST_PRINT = boost::test_tools::tt_detail; + #define BOOST_PRINT_NAMESPACE boost::test_tools::tt_detail #endif #endif // UNIT_TEST_UTILS__H \ No newline at end of file