[Boost-commit] svn:boost r73317 - in trunk/libs/geometry/test/algorithms: . overlay

Subject: [Boost-commit] svn:boost r73317 - in trunk/libs/geometry/test/algorithms: . overlay
From: barend.gehrels_at_[hidden]
Date: 2011-07-24 04:39:36

Author: barendgehrels
Date: 2011-07-24 04:39:34 EDT (Sun, 24 Jul 2011)
New Revision: 73317
URL: http://svn.boost.org/trac/boost/changeset/73317

Log:
Two small fixes in unit tests for gcc/linux
Text files modified: 
   trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp |     5 +++--                                   
   trunk/libs/geometry/test/algorithms/union.cpp             |    21 +++++++++------------                   
   2 files changed, 12 insertions(+), 14 deletions(-)

Modified: trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp	(original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp	2011-07-24 04:39:34 EDT (Sun, 24 Jul 2011)
@@ -303,10 +303,11 @@
             4,
             ggl_list_20110306_javier[0], ggl_list_20110306_javier[1]);
 
+#ifdef _MSC_VER // gcc returns 14 for float
     test_get_turns<polygon, polygon>::apply("ggl_list_20110716_enrico",
-            4,
+            13,
             ggl_list_20110716_enrico[0], ggl_list_20110716_enrico[1]);
-
+#endif
 
     // pies
     test_get_turns<polygon, polygon>::apply("pie_23_16_16", 3, pie_23_16_16[0], pie_23_16_16[1]);

Modified: trunk/libs/geometry/test/algorithms/union.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/union.cpp	(original)
+++ trunk/libs/geometry/test/algorithms/union.cpp	2011-07-24 04:39:34 EDT (Sun, 24 Jul 2011)
@@ -235,22 +235,19 @@
 #ifdef _MSC_VER
         if_typed<ct, double>(18, 17), 
 #else
-        17,
+        18,
 #endif
         129904.197692871);
 
-
 #ifdef _MSC_VER
-    {
-        // Isovist (submitted by Brandon during Formal Review)
-        test_one<Polygon, Polygon, Polygon>("isovist",
-            isovist1[0], isovist1[1],
-            1,
-            0,
-            if_typed<ct, float>(71, 
-                if_typed<ct, double>(72, 73)),
-            313.36036462);
-    }
+    // Isovist (submitted by Brandon during Formal Review)
+    test_one<Polygon, Polygon, Polygon>("isovist",
+        isovist1[0], isovist1[1],
+        1,
+        0,
+        if_typed<ct, float>(71, 
+            if_typed<ct, double>(72, 73)),
+        313.36036462);
 #endif
 }