update sources to v12.2.3

[ceph.git] / ceph / src / boost / libs / geometry / test / algorithms / distance / test_distance_common.hpp

diff --git a/ceph/src/boost/libs/geometry/test/algorithms/distance/test_distance_common.hpp b/ceph/src/boost/libs/geometry/test/algorithms/distance/test_distance_common.hpp
index 11ef52c404f6e43818190f2ab50706262dc45599..f27f66aa7b7744ee2bf4dcf736130c4ea20c2b69 100644 (file)
--- a/ceph/src/boost/libs/geometry/test/algorithms/distance/test_distance_common.hpp
+++ b/ceph/src/boost/libs/geometry/test/algorithms/distance/test_distance_common.hpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014-2017, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -37,6 +38,8 @@
 #include <boost/geometry/algorithms/distance.hpp>
 #include <boost/geometry/algorithms/comparable_distance.hpp>
 
+#include <boost/geometry/strategies/strategies.hpp>
+
 #include <from_wkt.hpp>
 #include <string_from_type.hpp>
 
@@ -170,6 +173,11 @@ struct test_distance_of_geometries
     : public test_distance_of_geometries<Geometry1, Geometry2, 0, 0>
 {};
 
+#ifdef BOOST_GEOMETRY_TEST_DEBUG
+#define ENABLE_IF_DEBUG(ID) ID
+#else
+#define ENABLE_IF_DEBUG(ID)
+#endif
 
 template <typename Geometry1, typename Geometry2>
 class test_distance_of_geometries<Geometry1, Geometry2, 0, 0>
@@ -184,7 +192,7 @@ private:
         typename Strategy
     >
     static inline
-    void base_test(std::string const& header,
+    void base_test(std::string const& ENABLE_IF_DEBUG(header),
                    G1 const& g1, G2 const& g2,
                    DistanceType const& expected_distance,
                    ComparableDistanceType const& expected_comparable_distance,