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

[relate][get_turns] fixed (GCC) compilation errors (missing include, typename keyword, shadowing of template parameters)

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-03-20 01:59:33 +01:00
parent 9d49d802e9
commit b79b857d1e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
View File

@@ -54,6 +54,7 @@
#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
#include <boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp>
#include <boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp>
#include <boost/geometry/algorithms/detail/group_dim.hpp>
#include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>

12
include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
View File

@@ -266,7 +266,9 @@ struct linear_areal
// sort by multi_index and rind_index
std::sort(turns.begin(), turns.end(), less_ring());
std::vector<turn_type>::iterator it = turns.begin();
typedef typename std::vector<turn_type>::iterator turn_iterator;
turn_iterator it = turns.begin();
segment_identifier * prev_seg_id_ptr = NULL;
// for each ring
for ( ; it != turns.end() ; )
@@ -315,8 +317,7 @@ struct linear_areal
// find the next ring first iterator and check if the analysis should be performed
has_boundary_intersection has_boundary_inters;
std::vector<turn_type>::iterator
next = find_next_ring(it, turns.end(), has_boundary_inters);
turn_iterator next = find_next_ring(it, turns.end(), has_boundary_inters);
// if there is no 1d overlap with the boundary
if ( !has_boundary_inters.result )
@@ -333,8 +334,7 @@ struct linear_areal
// analyse
areal_boundary_analyser<turn_type> analyser;
for ( std::vector<turn_type>::iterator rit = it ;
rit != next ; ++rit )
for ( turn_iterator rit = it ; rit != next ; ++rit )
{
// if the analyser requests, break the search
if ( !analyser.apply(it, rit, next) )
@@ -808,7 +808,7 @@ struct linear_areal
// check if the passed turn's segment of Linear geometry arrived
// from the inside or the outside of the Areal geometry
template <typename Geometry1, typename Geometry2, typename Turn>
template <typename Turn>
static inline bool calculate_from_inside(Geometry1 const& geometry1,
Geometry2 const& geometry2,
Turn const& turn)