[Boost-commit] svn:boost r73326 - trunk/boost/geometry/algorithms

Subject: [Boost-commit] svn:boost r73326 - trunk/boost/geometry/algorithms
From: barend.gehrels_at_[hidden]
Date: 2011-07-24 05:56:07

Author: barendgehrels
Date: 2011-07-24 05:56:05 EDT (Sun, 24 Jul 2011)
New Revision: 73326
URL: http://svn.boost.org/trac/boost/changeset/73326

Log:
Fix in assert for gcc (probably gcc-bug, gcc 4.4.5 on Linux, it considers a const expr. in a macro as non-const)
Text files modified: 
   trunk/boost/geometry/algorithms/assign.hpp |    11 +++++++----                             
   1 files changed, 7 insertions(+), 4 deletions(-)

Modified: trunk/boost/geometry/algorithms/assign.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/assign.hpp	(original)
+++ trunk/boost/geometry/algorithms/assign.hpp	2011-07-24 05:56:05 EDT (Sun, 24 Jul 2011)
@@ -147,16 +147,19 @@
 {
     concept::check_concepts_and_equal_dimensions<Geometry1, Geometry2 const>();
 
+    bool const same_point_order = 
+            point_order<Geometry1>::value == point_order<Geometry2>::value;
+    bool const same_closure = 
+            closure<Geometry1>::value == closure<Geometry2>::value;
+
     BOOST_MPL_ASSERT_MSG
         (
-            (point_order<Geometry1>::value == point_order<Geometry2>::value), 
-            ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_POINT_ORDER
+            same_point_order, ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_POINT_ORDER
             , (types<Geometry1, Geometry2>)
         );
     BOOST_MPL_ASSERT_MSG
         (
-            (closure<Geometry1>::value == closure<Geometry2>::value), 
-            ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_CLOSURE
+            same_closure, ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_CLOSURE
             , (types<Geometry1, Geometry2>)
         );