boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-11 11:52:11 +00:00
Code Issues Projects Releases Wiki Activity

[geometry] Fixed compilation errors after merge

Browse Source 
(part 1: trivial changes)
This commit is contained in:
Barend Gehrels
2014-03-26 13:35:01 +01:00
parent da7c741eb8
commit 2bd9a0f7e8
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
View File

@@ -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;
}

5
include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
View File

@@ -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;
}

2
include/boost/geometry/algorithms/detail/relate/turns.hpp
View File

@@ -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;

6
include/boost/geometry/policies/robustness/robust_type.hpp
View File

@@ -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