update sources to v12.2.3

[ceph.git] / ceph / src / boost / libs / geometry / test / algorithms / relational_operations / relate / test_relate.hpp

diff --git a/ceph/src/boost/libs/geometry/test/algorithms/relational_operations/relate/test_relate.hpp b/ceph/src/boost/libs/geometry/test/algorithms/relational_operations/relate/test_relate.hpp
index 77359d9eab5ffe47629d517fa73a7af9ce3b0dcf..859d29aded1045dde4e97bb2854279a0b9068a01 100644 (file)
--- a/ceph/src/boost/libs/geometry/test/algorithms/relational_operations/relate/test_relate.hpp
+++ b/ceph/src/boost/libs/geometry/test/algorithms/relational_operations/relate/test_relate.hpp
@@ -2,9 +2,8 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2013, 2014, 2015.
-// Modifications copyright (c) 2013-2015 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2013, 2014, 2015, 2017.
+// Modifications copyright (c) 2013-2017 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -128,6 +127,13 @@ void check_geometry(Geometry1 const& geometry1,
             << " -> Expected: " << matrix_format(expected1, expected2)
             << " detected: " << res_str);
 
+        typedef typename bg::strategy::relate::services::default_strategy
+            <
+                Geometry1, Geometry2
+            >::type strategy_type;
+        std::string res_str0 = bg::relation(geometry1, geometry2, strategy_type()).str();
+        BOOST_CHECK(res_str == res_str0);
+
         // test variants
         boost::variant<Geometry1> v1 = geometry1;
         boost::variant<Geometry2> v2 = geometry2;
@@ -162,6 +168,13 @@ void check_geometry(Geometry1 const& geometry1,
                 << " and " << wkt2
                 << " -> Expected: " << expected1);
 
+            typedef typename bg::strategy::relate::services::default_strategy
+                <
+                    Geometry1, Geometry2
+                >::type strategy_type;
+            bool result0 = bg::relate(geometry1, geometry2, bg::de9im::mask(expected1), strategy_type());
+            BOOST_CHECK(result == result0);
+
             // test variants
             bool result1 = bg::relate(geometry1, variant2, bg::de9im::mask(expected1));
             bool result2 = bg::relate(variant1, geometry2, bg::de9im::mask(expected1));