From 2bd9a0f7e86799a1655774dcddfa5b4e01506891 Mon Sep 17 00:00:00 2001
From: Barend Gehrels <barend@xs4all.nl>
Date: Wed, 26 Mar 2014 13:35:01 +0100
Subject: [PATCH] [geometry] Fixed compilation errors after merge (part 1:
 trivial changes)

---
 .../geometry/algorithms/detail/overlay/get_turn_info_la.hpp | 5 +++--
 .../geometry/algorithms/detail/overlay/get_turn_info_ll.hpp | 5 +++--
 include/boost/geometry/algorithms/detail/relate/turns.hpp   | 2 +-
 include/boost/geometry/policies/robustness/robust_type.hpp  | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
index 0bbd1e57d..774b5eb59 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
@@ -57,7 +57,8 @@ struct get_turn_info_linear_areal
                 typename cs_tag<typename TurnInfo::point_type>::type,
                 Point1,
                 Point2,
-                typename TurnInfo::point_type
+                typename TurnInfo::point_type,
+                RescalePolicy
             > si;
 
         typedef typename si::segment_intersection_strategy_type strategy;
@@ -277,7 +278,7 @@ struct get_turn_info_linear_areal
                 // degenerate points
                 if (AssignPolicy::include_degenerate)
                 {
-                    only_convert<TurnInfo>::apply(tp, result.template get<0>());
+                    only_convert::apply(tp, result.template get<0>());
                     AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
                     *out++ = tp;
                 }
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
index 586bc3f91..b07ac1ce6 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
@@ -110,7 +110,8 @@ struct get_turn_info_linear_linear
                 typename cs_tag<typename TurnInfo::point_type>::type,
                 Point1,
                 Point2,
-                typename TurnInfo::point_type
+                typename TurnInfo::point_type,
+                RescalePolicy
             > si;
 
         typedef typename si::segment_intersection_strategy_type strategy;
@@ -361,7 +362,7 @@ struct get_turn_info_linear_linear
                 // degenerate points
                 if (AssignPolicy::include_degenerate)
                 {
-                    only_convert<TurnInfo>::apply(tp, result.template get<0>());
+                    only_convert::apply(tp, result.template get<0>());
                     AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
                     *out++ = tp;
                 }
diff --git a/include/boost/geometry/algorithms/detail/relate/turns.hpp b/include/boost/geometry/algorithms/detail/relate/turns.hpp
index a396534a3..49f69f379 100644
--- a/include/boost/geometry/algorithms/detail/relate/turns.hpp
+++ b/include/boost/geometry/algorithms/detail/relate/turns.hpp
@@ -71,7 +71,7 @@ struct enriched_turn_operation_linear
 template <typename Geometry1,
           typename Geometry2,
           typename GetTurnPolicy
-            = detail::get_turns::get_turn_info_type<Geometry1, Geometry2, overlay::calculate_distance_policy> >
+            = detail::get_turns::get_turn_info_type<Geometry1, Geometry2, overlay::assign_null_policy> >
 struct get_turns
 {
     typedef typename geometry::point_type<Geometry1>::type point1_type;
diff --git a/include/boost/geometry/policies/robustness/robust_type.hpp b/include/boost/geometry/policies/robustness/robust_type.hpp
index fe933db43..4cfb2c4d9 100644
--- a/include/boost/geometry/policies/robustness/robust_type.hpp
+++ b/include/boost/geometry/policies/robustness/robust_type.hpp
@@ -21,8 +21,6 @@ namespace boost { namespace geometry
 {
 
 #ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
 
 namespace detail_dispatch
 {
@@ -44,8 +42,10 @@ struct robust_type<CoordinateType, boost::true_type>
     typedef boost::long_long_type type;
 };
 
-} // namespace dispatch
+} // namespace detail_dispatch
 
+namespace detail
+{
 
 template <typename CoordinateType>
 struct robust_type