[Boost-commit] svn:boost r78146 - sandbox/gtl/boost/polygon

Subject: [Boost-commit] svn:boost r78146 - sandbox/gtl/boost/polygon
From: sydorchuk.andriy_at_[hidden]
Date: 2012-04-22 16:05:45

Author: asydorchuk
Date: 2012-04-22 16:05:44 EDT (Sun, 22 Apr 2012)
New Revision: 78146
URL: http://svn.boost.org/trac/boost/changeset/78146

Log:
Fixes for low and high methods.
Text files modified: 
   sandbox/gtl/boost/polygon/directed_line_segment_concept.hpp |    14 ++++++++++----                          
   sandbox/gtl/boost/polygon/interval_concept.hpp              |    14 ++++++++++----                          
   2 files changed, 20 insertions(+), 8 deletions(-)

Modified: sandbox/gtl/boost/polygon/directed_line_segment_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/directed_line_segment_concept.hpp	(original)
+++ sandbox/gtl/boost/polygon/directed_line_segment_concept.hpp	2012-04-22 16:05:44 EDT (Sun, 22 Apr 2012)
@@ -189,7 +189,7 @@
   template <typename segment_type>
   typename enable_if< typename gtl_and<
         y_s_low,
-        typename is_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type,
+        typename gtl_if<typename is_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type>::type,
       typename directed_line_segment_point_type<segment_type>::type>::type
   low(const segment_type& segment) { return get(segment, LOW); }
 
@@ -199,7 +199,7 @@
   template <typename segment_type>
   typename enable_if< typename gtl_and<
         y_s_high,
-        typename is_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type,
+        typename gtl_if<typename is_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type>::type,
       typename directed_line_segment_point_type<segment_type>::type>::type
   high(const segment_type& segment) { return get(segment, HIGH); }
 
@@ -220,7 +220,10 @@
 
   // set the low point to v
   template <typename segment_type>
-  typename enable_if<typename gtl_and<y_s_low2, typename is_mutable_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type, void>::type 
+  typename enable_if<typename gtl_and<
+        y_s_low2,
+        typename gtl_if<typename is_mutable_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type>::type,
+      void>::type 
     low(segment_type& segment, typename directed_line_segment_traits<segment_type>::point_type v) { set(segment, LOW, v);
   }
   
@@ -228,7 +231,10 @@
 
   // set the high coordinate to v
   template <typename segment_type>
-  typename enable_if<typename gtl_and<y_s_high2, typename is_mutable_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type, void>::type 
+  typename enable_if<typename gtl_and<
+        y_s_high2,
+        typename gtl_if<typename is_mutable_directed_line_segment_concept<typename geometry_concept<segment_type>::type>::type>::type>::type,
+      void>::type 
     high(segment_type& segment, typename directed_line_segment_traits<segment_type>::point_type v) { set(segment, HIGH, v);
   }
 

Modified: sandbox/gtl/boost/polygon/interval_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/interval_concept.hpp	(original)
+++ sandbox/gtl/boost/polygon/interval_concept.hpp	2012-04-22 16:05:44 EDT (Sun, 22 Apr 2012)
@@ -157,7 +157,7 @@
   template <typename interval_type>
   typename enable_if< typename gtl_and<
         y_i_low,
-        typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type,
+        typename gtl_if<typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type>::type,
       typename interval_traits<interval_type>::coordinate_type>::type
   low(const interval_type& interval) { return get(interval, LOW); }
 
@@ -167,7 +167,7 @@
   template <typename interval_type>
   typename enable_if< typename gtl_and<
         y_i_high,
-        typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type,
+        typename gtl_if<typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type>::type,
       typename interval_traits<interval_type>::coordinate_type>::type
   high(const interval_type& interval) { return get(interval, HIGH); }
 
@@ -186,7 +186,10 @@
 
   // set the low coordinate to v
   template <typename interval_type>
-  typename enable_if<typename gtl_and<y_i_low2, typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type, void>::type 
+  typename enable_if<typename gtl_and<
+        y_i_low2,
+        typename gtl_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type>::type,
+      void>::type 
   low(interval_type& interval,
       typename interval_traits<interval_type>::coordinate_type v) { set(interval, LOW, v); }
   
@@ -194,7 +197,10 @@
 
   // set the high coordinate to v
   template <typename interval_type>
-  typename enable_if<typename gtl_and<y_i_high2, typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type, void>::type 
+  typename enable_if<typename gtl_and<
+        y_i_high2,
+        typename gtl_if<typename is_mutable_interval_concept<typename geometry_concept<interval_type>::type>::type>::type>::type,
+      void>::type 
   high(interval_type& interval,
       typename interval_traits<interval_type>::coordinate_type v) { set(interval, HIGH, v); }