Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76890 - in trunk/libs/geometry/test: . algorithms/overlay
From: barend.gehrels_at_[hidden]
Date: 2012-02-04 17:12:12


Author: barendgehrels
Date: 2012-02-04 17:12:12 EST (Sat, 04 Feb 2012)
New Revision: 76890
URL: http://svn.boost.org/trac/boost/changeset/76890

Log:
Adapted test Christoph to gcc which, for long double, also results in a polygon (pt 2 / msvc as well)
Text files modified:
   trunk/libs/geometry/test/algorithms/overlay/traverse.cpp | 6 +++---
   trunk/libs/geometry/test/geometry_test_common.hpp | 2 +-
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/libs/geometry/test/algorithms/overlay/traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse.cpp 2012-02-04 17:12:12 EST (Sat, 04 Feb 2012)
@@ -891,12 +891,12 @@
     {
 
 #if defined(_MSC_VER)
- T const expected = if_typed_tt<T>(3.63794e-17, 0.0);
+ double const expected = if_typed_tt<T>(3.63794e-17, 0.0);
 #else
- T const expected = if_typed<T, long double>(2.77555756156289135106e-17, 0.0);
+ double const expected = if_typed<T, long double>(2.77555756156289135106e-17, 0.0);
 #endif
 
- // Calculate intersection/union of two triangles. Robustness case.
+ // Calculate intersection/union of two triangles. Robustness case.
         // ttmath can form a very small intersection triangle
         // (which is even not accomplished by SQL Server/PostGIS)
         std::string const caseid = "ggl_list_20110820_christophe";

Modified: trunk/libs/geometry/test/geometry_test_common.hpp
==============================================================================
--- trunk/libs/geometry/test/geometry_test_common.hpp (original)
+++ trunk/libs/geometry/test/geometry_test_common.hpp 2012-02-04 17:12:12 EST (Sat, 04 Feb 2012)
@@ -112,7 +112,7 @@
 
 
 template <typename CoordinateType, typename T1, typename T2>
-inline CoordinateType if_typed_tt(T1 value_tt, T2 value)
+inline T1 if_typed_tt(T1 value_tt, T2 value)
 {
 #if defined(HAVE_TTMATH)
     return boost::is_same<CoordinateType, ttmath_big>::type::value ? value_tt : value;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk