diff --git a/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp b/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp index bc5b619a7..aa11e25f9 100644 --- a/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp +++ b/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp @@ -193,7 +193,7 @@ struct areal_areal // TODO: If Areal geometry may have infinite size, change the following line: // The result should be FFFFFFFFF - set::value>(result);// FFFFFFFFd, d in [1,9] or T + relate::set::value>(result);// FFFFFFFFd, d in [1,9] or T if ( result.interrupt ) return; diff --git a/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp b/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp index d1ec480f5..9692372b5 100644 --- a/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp +++ b/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp @@ -194,7 +194,7 @@ struct linear_areal // TODO: If Areal geometry may have infinite size, change the following line: // The result should be FFFFFFFFF - set::value, TransposeResult>(result);// FFFFFFFFd, d in [1,9] or T + relate::set::value, TransposeResult>(result);// FFFFFFFFd, d in [1,9] or T if ( result.interrupt ) return; @@ -232,7 +232,7 @@ struct linear_areal // This is set here because in the case if empty Areal geometry were passed // those shouldn't be set - set(result);// FFFFFF2Fd + relate::set(result);// FFFFFF2Fd if ( result.interrupt ) return; @@ -255,7 +255,7 @@ struct linear_areal // If 'c' (insersection_boundary) was not found we know that any Ls isn't equal to one of the Rings if ( !interrupt_policy.is_boundary_found ) { - set(result); + relate::set(result); } // Don't calculate it if it's required else if ( may_update(result) ) @@ -286,7 +286,7 @@ struct linear_areal if ( it->operations[1].seg_id.ring_index > -1 ) { // we can be sure that the exterior overlaps the boundary - set(result); + relate::set(result); break; } // if there was some previous ring @@ -301,7 +301,7 @@ struct linear_areal single_geometry(geometry2, *prev_seg_id_ptr)) ) { // we can be sure that the exterior overlaps the boundary - set(result); + relate::set(result); break; } } @@ -314,7 +314,7 @@ struct linear_areal && prev_seg_id_ptr->ring_index + 1 < it->operations[1].seg_id.ring_index ) { // we can be sure that the exterior overlaps the boundary - set(result); + relate::set(result); break; } } @@ -329,7 +329,7 @@ struct linear_areal if ( !has_boundary_inters.result ) { // we can be sure that the exterior overlaps the boundary - set(result); + relate::set(result); break; } // else there is 1d overlap with the boundary so we must analyse the boundary @@ -352,7 +352,7 @@ struct linear_areal if ( analyser.is_union_detected ) { // we can be sure that the boundary of Areal overlaps the exterior of Linear - set(result); + relate::set(result); break; } } @@ -372,7 +372,7 @@ struct linear_areal single_geometry(geometry2, *prev_seg_id_ptr)) ) { // we can be sure that the exterior overlaps the boundary - set(result); + relate::set(result); } } } diff --git a/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp b/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp index 32795e63b..8d35dc3c4 100644 --- a/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp +++ b/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp @@ -223,7 +223,7 @@ struct linear_linear static inline void apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Result & result) { // The result should be FFFFFFFFF - set::value>(result);// FFFFFFFFd, d in [1,9] or T + relate::set::value>(result);// FFFFFFFFd, d in [1,9] or T if ( result.interrupt ) return;