From 2c816039b992e9f3efb23da60fd9b124d4dddd36 Mon Sep 17 00:00:00 2001
From: Barend Gehrels <barend@xs4all.nl>
Date: Fri, 13 Jan 2012 17:19:55 +0000
Subject: [PATCH] Fixes in extension buffer

[SVN r76460]
---
 .../extensions/algorithms/buffer/polygon_buffer.hpp        | 7 ++++---
 .../extensions/algorithms/buffer/segmenting_buffer.hpp     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp b/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp
index f90103b58..101de1fce 100644
--- a/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp
+++ b/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp
@@ -17,6 +17,7 @@
 #include <boost/typeof/typeof.hpp>
 
 #include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
 
 #include <boost/geometry/extensions/strategies/buffer_side.hpp>
 #include <boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp>
@@ -50,7 +51,7 @@ struct ring_buffer
 #endif
             )
     {
-        typedef segment<output_point_type const> segment_type;
+        typedef model::referring_segment<output_point_type const> segment_type;
         typedef typename boost::range_iterator
             <
                 RingInput const
@@ -205,9 +206,9 @@ struct polygon_buffer
 #endif
                 );
 
-        typename interior_return_type<Polygon const>::type rings
+        typename interior_return_type<PolygonInput const>::type rings
                     = interior_rings(polygon);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings); it != boost::end(rings); ++it)
+        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
         {
             output_ring_type ring;
             policy::apply(*it, ring, distance, join_strategy
diff --git a/include/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp b/include/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp
index 2cd40ec10..7b99a749e 100644
--- a/include/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp
+++ b/include/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp
@@ -92,7 +92,7 @@ struct per_segment_buffer
     typedef typename point_type<GeometryOut>::type point_type;
     typedef typename coordinate_type<point_type>::type coordinate_type;
     typedef coordinate_type distance_type; // TODO promote to FP
-    typedef segment<point_type const> segment_type;
+    typedef model::segment<point_type const> segment_type;
     typedef typename geometry::ring_type<GeometryOut>::type ring_type;
     typedef typename strategy::side::services::default_strategy<typename cs_tag<point_type>::type>::type side;