[Boost-commit] svn:boost r77211 - trunk/boost/geometry/extensions/algorithms/buffer

Subject: [Boost-commit] svn:boost r77211 - trunk/boost/geometry/extensions/algorithms/buffer
From: barend.gehrels_at_[hidden]
Date: 2012-03-04 07:09:35

Author: barendgehrels
Date: 2012-03-04 07:09:34 EST (Sun, 04 Mar 2012)
New Revision: 77211
URL: http://svn.boost.org/trac/boost/changeset/77211

Log:
[geometry] update buffer for gcc compilation (does not accept sort/remove_if on struct defs in member functions)
Text files modified: 
   trunk/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp |    17 ++++++-----------                       
   trunk/boost/geometry/extensions/algorithms/buffer/buffered_ring.hpp             |     3 ++-                                     
   2 files changed, 8 insertions(+), 12 deletions(-)

Modified: trunk/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp	(original)
+++ trunk/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp	2012-03-04 07:09:34 EST (Sun, 04 Mar 2012)
@@ -459,9 +459,6 @@
             }
         }
     }
-
-	inline void classify_clustered()
-	{
                 struct angle_sort
                 {
                         inline bool operator()(angle_info const& left, angle_info const& right) const
@@ -473,6 +470,9 @@
                         }
                 };
 
+	inline void classify_clustered()
+	{
+
         for (typename boost::range_iterator<clustered_location_type>::type it =
                     boost::begin(clustered_turn_locations);
                         it != boost::end(clustered_turn_locations); ++it)
@@ -482,11 +482,6 @@
                         {
                                 std::sort(admin.angles.begin(), admin.angles.end(), angle_sort());
 
-				if (boost::size(admin.angles) == 10)
-				{
-					int kkk = 0;
-				}
-
                                 // Verify if completely closed
                                 bool closed = true;
 
@@ -759,9 +754,6 @@
             }
         }
     }
-                    
-    inline void discard_turns()
-    {
                 struct redundant_turn
                 {
                         inline bool operator()(buffer_turn_info<point_type> const& turn) const
@@ -773,6 +765,9 @@
                         }
                 };
 
+                    
+    inline void discard_turns()
+    {
         m_turns.erase
                         (
                                 std::remove_if(boost::begin(m_turns), boost::end(m_turns),

Modified: trunk/boost/geometry/extensions/algorithms/buffer/buffered_ring.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/buffer/buffered_ring.hpp	(original)
+++ trunk/boost/geometry/extensions/algorithms/buffer/buffered_ring.hpp	2012-03-04 07:09:34 EST (Sun, 04 Mar 2012)
@@ -43,8 +43,9 @@
 template <typename Ring>
 struct buffered_ring : public Ring
 {
-    bool has_discarded_intersections;
     bool has_accepted_intersections;
+    bool has_discarded_intersections;
+
     inline buffered_ring()
         : has_accepted_intersections(false)
         , has_discarded_intersections(false)