update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / libs / geometry / test / algorithms / set_operations / difference / difference.cpp

diff --git a/ceph/src/boost/libs/geometry/test/algorithms/set_operations/difference/difference.cpp b/ceph/src/boost/libs/geometry/test/algorithms/set_operations/difference/difference.cpp
index e1a8116766eb987fb56550d86b9b09484eeb4ced..e29392f4eb5a587b5fce2e58d1f13fe725393f5c 100644 (file)
--- a/ceph/src/boost/libs/geometry/test/algorithms/set_operations/difference/difference.cpp
+++ b/ceph/src/boost/libs/geometry/test/algorithms/set_operations/difference/difference.cpp
@@ -41,7 +41,7 @@
     ( #caseid, caseid[0], caseid[1], clips1, -1, area1, clips2, -1, area2, \
                 clips3, -1, area1 + area2)
 
-#if !defined(BOOST_GEOMETRY_INCLUDE_SELF_TURNS)
+#if defined(BOOST_GEOMETRY_NO_SELF_TURNS)
 #define TEST_DIFFERENCE_IGNORE(caseid, clips1, area1, clips2, area2, clips3) \
     { ut_settings ignore_validity; ignore_validity.test_validity = false; \
     (test_one<polygon, polygon, polygon>) \
@@ -536,8 +536,7 @@ void test_all()
             5, 27, 1.6701714);
     ***/
 
-    // Should have 2 outputs
-#ifdef BOOST_GEOMETRY_INCLUDE_SELF_TURNS
+#ifndef BOOST_GEOMETRY_NO_SELF_TURNS
     TEST_DIFFERENCE(mysql_21977775,
                            2, 160.856568913, 2, 92.3565689126, 4);
 #else
@@ -550,7 +549,7 @@ void test_all()
     TEST_DIFFERENCE(mysql_23023665_1, 1, 92.0, 1, 142.5, 2);
     TEST_DIFFERENCE(mysql_23023665_2, 1, 96.0, 1, 16.0, 2);
     TEST_DIFFERENCE(mysql_23023665_3, 1, 225.0, 1, 66.0, 2);
-#ifdef BOOST_GEOMETRY_INCLUDE_SELF_TURNS
+#ifndef BOOST_GEOMETRY_NO_SELF_TURNS
     TEST_DIFFERENCE(mysql_23023665_5, 2, 165.23735, 2, 105.73735, 4);
 #else
     TEST_DIFFERENCE_IGNORE(mysql_23023665_5, 1, 165.23735, 2, 105.73735, 3);
@@ -558,7 +557,7 @@ void test_all()
 
     TEST_DIFFERENCE(mysql_23023665_6, 2, 105.68756, 3, 10.18756, 5);
 
-#ifdef BOOST_GEOMETRY_INCLUDE_SELF_TURNS
+#ifndef BOOST_GEOMETRY_NO_SELF_TURNS
     TEST_DIFFERENCE(mysql_23023665_13, 3, 99.74526, 3, 37.74526, 6);
 #else
     TEST_DIFFERENCE_IGNORE(mysql_23023665_13, 2, 99.74526, 3, 37.74526, 5);
@@ -589,7 +588,7 @@ void test_specific()
         1, 4, 6731652.0);
 
     // Generates spikes, both a-b and b-a
-#ifdef BOOST_GEOMETRY_INCLUDE_SELF_TURNS
+#ifndef BOOST_GEOMETRY_NO_SELF_TURNS
     TEST_DIFFERENCE(ticket_11676, 2, 2537992.5, 2, 294963.5, 3);
 #else
     TEST_DIFFERENCE_IGNORE(ticket_11676, 1, 2537992.5, 2, 294963.5, 2);