From 64c11353be4fbdbdc19ab1cfba00d5aa936dd8ad Mon Sep 17 00:00:00 2001
From: Menelaos Karavelas <menelaos.karavelas@gmail.com>
Date: Thu, 27 Mar 2014 02:25:38 +0200
Subject: [PATCH] [point_iterator] move flatten and concatenate iterator
 implementation in iterators/ directory;

---
 .../concatenate_iterator.hpp                  | 12 ++++------
 .../{util => iterators}/flatten_iterator.hpp  | 24 +++++--------------
 2 files changed, 11 insertions(+), 25 deletions(-)
 rename include/boost/geometry/{util => iterators}/concatenate_iterator.hpp (86%)
 rename include/boost/geometry/{util => iterators}/flatten_iterator.hpp (87%)

diff --git a/include/boost/geometry/util/concatenate_iterator.hpp b/include/boost/geometry/iterators/concatenate_iterator.hpp
similarity index 86%
rename from include/boost/geometry/util/concatenate_iterator.hpp
rename to include/boost/geometry/iterators/concatenate_iterator.hpp
index 7071cf87b..da2e78986 100644
--- a/include/boost/geometry/util/concatenate_iterator.hpp
+++ b/include/boost/geometry/iterators/concatenate_iterator.hpp
@@ -7,18 +7,18 @@
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
 
-#ifndef BOOST_GEOMETRY_UTIL_POINT_CONCATENATE_ITERATOR_HPP
-#define BOOST_GEOMETRY_UTIL_POINT_CONCATENATE_ITERATOR_HPP
+#ifndef BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
+#define BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
 
+#include <boost/iterator.hpp>
 #include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/iterator_categories.hpp>
 
 
 namespace boost { namespace geometry
 {
 
 
-namespace util
-{
 
 
 template <typename Iterator1, typename Iterator2, typename Value>
@@ -83,9 +83,7 @@ private:
 };
 
 
-} // namespace util
-
 
 }} // namespace boost::geometry
 
-#endif // BOOST_GEOMETRY_UTIL_CONCATENATE_ITERATOR_HPP
+#endif // BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
diff --git a/include/boost/geometry/util/flatten_iterator.hpp b/include/boost/geometry/iterators/flatten_iterator.hpp
similarity index 87%
rename from include/boost/geometry/util/flatten_iterator.hpp
rename to include/boost/geometry/iterators/flatten_iterator.hpp
index 9b44370bc..67847593d 100644
--- a/include/boost/geometry/util/flatten_iterator.hpp
+++ b/include/boost/geometry/iterators/flatten_iterator.hpp
@@ -7,21 +7,20 @@
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
 
-#ifndef BOOST_GEOMETRY_UTIL_FLATTEN_ITERATOR_HPP
-#define BOOST_GEOMETRY_UTIL_FLATTEN_ITERATOR_HPP
+#ifndef BOOST_GEOMETRY_ITERATORS_FLATTEN_ITERATOR_HPP
+#define BOOST_GEOMETRY_ITERATORS_FLATTEN_ITERATOR_HPP
 
 #include <boost/type_traits.hpp>
 #include <boost/utility/enable_if.hpp>
+#include <boost/iterator.hpp>
 #include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/iterator_categories.hpp>
 
 
 namespace boost { namespace geometry
 {
 
 
-namespace util
-{
-
 
 template
 <
@@ -62,11 +61,6 @@ public:
     flatten_iterator(OuterIterator outer_it, OuterIterator outer_end)
         : m_outer_it(outer_it), m_outer_end(outer_end)
     {
-        if ( m_outer_it != m_outer_end )
-        {
-            m_inner_it = AccessInnerBegin::apply(*m_outer_it);
-            //        m_inner_it = AccessInnerBegin(*m_outer_it);
-        }
         advance_through_empty();
     }
 
@@ -140,7 +134,6 @@ private:
     {
         return
             AccessInnerBegin::apply(*outer_it) == AccessInnerEnd::apply(*outer_it);
-        //            AccessInnerBegin(*outer_it) == AccessInnerEnd(*outer_it);
     }
 
     void advance_through_empty()
@@ -153,7 +146,6 @@ private:
         if ( m_outer_it != m_outer_end )
         {
             m_inner_it = AccessInnerBegin::apply(*m_outer_it);
-            //            m_inner_it = AccessInnerBegin(*m_outer_it);
         }
     }
 
@@ -161,7 +153,6 @@ private:
     {
         BOOST_ASSERT( m_outer_it != m_outer_end );
         BOOST_ASSERT( m_inner_it != AccessInnerEnd::apply(*m_outer_it) );
-        //        BOOST_ASSERT( m_inner_it != AccessInnerEnd(*m_outer_it) );
         return *m_inner_it;
     }
 
@@ -198,11 +189,9 @@ private:
     {
         BOOST_ASSERT( m_outer_it != m_outer_end );
         BOOST_ASSERT( m_inner_it != AccessInnerEnd::apply(*m_outer_it) );
-        //        BOOST_ASSERT( m_inner_it != AccessInnerEnd(*m_outer_it) );
 
         ++m_inner_it;
         if ( m_inner_it == AccessInnerEnd::apply(*m_outer_it) )
-        //if ( m_inner_it == AccessInnerEnd(*m_outer_it) )
         {
             ++m_outer_it;
             advance_through_empty();
@@ -211,9 +200,8 @@ private:
 };
 
 
-} // namespace util
-
 
 }} // namespace boost::geometry
 
-#endif // BOOST_GEOMETRY_UTIL_FLATTEN_INTERATOR_HPP
+
+#endif // BOOST_GEOMETRY_ITERATORS_FLATTEN_ITERATOR_HPP