From 2a86cf0c201f964c07a46e01552ff64c62b1ba5c Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Wed, 4 Jun 2014 18:43:42 +0200
Subject: [PATCH] [geometry] Replace includes of headers from algorithms/detail
 moved from multi/ directory.

---
 .../detail/disjoint/linear_areal.hpp          |  1 -
 .../detail/disjoint/linear_linear.hpp         |  1 -
 .../detail/distance/single_to_multi.hpp       | 10 ++++----
 .../detail/has_self_intersections.hpp         |  2 --
 .../boost/geometry/multi/algorithms/area.hpp  |  2 +-
 .../geometry/multi/algorithms/correct.hpp     |  4 ++--
 .../geometry/multi/algorithms/covered_by.hpp  |  5 ----
 .../multi/algorithms/intersection.hpp         | 22 ++++++++---------
 .../geometry/multi/algorithms/length.hpp      |  4 +++-
 .../geometry/multi/algorithms/perimeter.hpp   |  2 +-
 .../geometry/multi/algorithms/reverse.hpp     |  2 +-
 include/boost/geometry/multi/multi.hpp        | 24 +++++++++----------
 12 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp b/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
index d4f2bff28..eefd351b8 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
@@ -36,7 +36,6 @@
 #include <boost/geometry/algorithms/covered_by.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/algorithms/detail/point_on_border.hpp>
-#include <boost/geometry/multi/algorithms/detail/point_on_border.hpp>
 
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/algorithms/detail/disjoint/point_box.hpp>
diff --git a/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp b/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
index 52f114edd..ad84d7191 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
@@ -33,7 +33,6 @@
 
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp>
 #include <boost/geometry/algorithms/detail/overlay/do_reverse.hpp>
 
 #include <boost/geometry/policies/disjoint_interrupt_policy.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp b/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
index d462a66a5..ca49339f7 100644
--- a/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
@@ -36,9 +36,12 @@
 #include <boost/geometry/util/math.hpp>
 
 #include <boost/geometry/algorithms/not_implemented.hpp>
-
 #include <boost/geometry/algorithms/dispatch/distance.hpp>
 
+#include <boost/geometry/algorithms/detail/for_each_range.hpp>
+#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
+
 #include <boost/geometry/views/detail/range_type.hpp>
 
 // includes needed from multi.hpp -- start
@@ -46,11 +49,6 @@
 #include <boost/geometry/multi/algorithms/disjoint.hpp>
 #include <boost/geometry/multi/algorithms/for_each.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
-
-#include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
-
 // includes needed from multi.hpp -- end
 
 #include <boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp>
diff --git a/include/boost/geometry/algorithms/detail/has_self_intersections.hpp b/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
index 632ec595d..dadd27e5b 100644
--- a/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
+++ b/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
@@ -22,8 +22,6 @@
 #include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
 #include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp>
-
 #ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
 #  include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
 #  include <boost/geometry/io/dsv/write.hpp>
diff --git a/include/boost/geometry/multi/algorithms/area.hpp b/include/boost/geometry/multi/algorithms/area.hpp
index 1a9598747..e2a88a380 100644
--- a/include/boost/geometry/multi/algorithms/area.hpp
+++ b/include/boost/geometry/multi/algorithms/area.hpp
@@ -18,10 +18,10 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/algorithms/area.hpp>
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/correct.hpp b/include/boost/geometry/multi/algorithms/correct.hpp
index 7821b924c..808e263f5 100644
--- a/include/boost/geometry/multi/algorithms/correct.hpp
+++ b/include/boost/geometry/multi/algorithms/correct.hpp
@@ -18,11 +18,11 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/algorithms/correct.hpp>
+#include <boost/geometry/algorithms/detail/multi_modify.hpp>
+
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/modify.hpp>
-
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/covered_by.hpp b/include/boost/geometry/multi/algorithms/covered_by.hpp
index dffd9bd1b..706bc7847 100644
--- a/include/boost/geometry/multi/algorithms/covered_by.hpp
+++ b/include/boost/geometry/multi/algorithms/covered_by.hpp
@@ -22,11 +22,6 @@
 
 
 #include <boost/geometry/algorithms/covered_by.hpp>
-#include <boost/geometry/core/closure.hpp>
-#include <boost/geometry/core/point_order.hpp>
-#include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/algorithms/within.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_COVERED_BY_HPP
diff --git a/include/boost/geometry/multi/algorithms/intersection.hpp b/include/boost/geometry/multi/algorithms/intersection.hpp
index e21067eb0..e0f3592e8 100644
--- a/include/boost/geometry/multi/algorithms/intersection.hpp
+++ b/include/boost/geometry/multi/algorithms/intersection.hpp
@@ -9,7 +9,6 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_INTERSECTION_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_INTERSECTION_HPP
 
-
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/geometry_id.hpp>
 #include <boost/geometry/core/is_areal.hpp>
@@ -17,19 +16,20 @@
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/multi/algorithms/covered_by.hpp>
-#include <boost/geometry/multi/algorithms/envelope.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
+// TODO: those headers probably may be removed
+#include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
+#include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
+#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
 #include <boost/geometry/algorithms/intersection.hpp>
 
+#include <boost/geometry/multi/algorithms/covered_by.hpp>
+#include <boost/geometry/multi/algorithms/envelope.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/length.hpp b/include/boost/geometry/multi/algorithms/length.hpp
index 7e4ddbae0..06d007de3 100644
--- a/include/boost/geometry/multi/algorithms/length.hpp
+++ b/include/boost/geometry/multi/algorithms/length.hpp
@@ -17,10 +17,12 @@
 
 #include <boost/range/metafunctions.hpp>
 
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/algorithms/length.hpp>
+
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
+
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/perimeter.hpp b/include/boost/geometry/multi/algorithms/perimeter.hpp
index 6b651b3ab..7afd28da9 100644
--- a/include/boost/geometry/multi/algorithms/perimeter.hpp
+++ b/include/boost/geometry/multi/algorithms/perimeter.hpp
@@ -17,12 +17,12 @@
 
 #include <boost/range/metafunctions.hpp>
 
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/algorithms/perimeter.hpp>
 
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/reverse.hpp b/include/boost/geometry/multi/algorithms/reverse.hpp
index 70c37d50d..2d6e53cee 100644
--- a/include/boost/geometry/multi/algorithms/reverse.hpp
+++ b/include/boost/geometry/multi/algorithms/reverse.hpp
@@ -17,12 +17,12 @@
 
 #include <boost/range/metafunctions.hpp>
 
+#include <boost/geometry/algorithms/detail/multi_modify.hpp>
 #include <boost/geometry/algorithms/reverse.hpp>
 
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/modify.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/multi.hpp b/include/boost/geometry/multi/multi.hpp
index 2e678f30a..86b4d2fcd 100644
--- a/include/boost/geometry/multi/multi.hpp
+++ b/include/boost/geometry/multi/multi.hpp
@@ -52,21 +52,21 @@
 #include <boost/geometry/multi/algorithms/unique.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/point_on_border.hpp>
+#include <boost/geometry/algorithms/detail/point_on_border.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
-#include <boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp>
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
+#include <boost/geometry/algorithms/detail/for_each_range.hpp>
+#include <boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp>
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
+#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
+#include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/geometries/concepts/multi_point_concept.hpp>