boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-11 05:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[is_valid] fix unit test linkage problem with two/three_or_more

Browse Source
This commit is contained in:
Barend Gehrels 2014-06-16 19:04:05 +02:00
parent b8535cab3c
commit 56d163fe1e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/geometry/algorithms/detail/is_valid/linear.hpp
View File

@ -42,11 +42,6 @@ namespace detail { namespace is_valid
template <typename Range> template <typename Range>
struct number_of_distinct_points struct number_of_distinct_points
{ {
static const std::size_t zero = 0;
static const std::size_t one = 1;
static const std::size_t two = 2;
static const std::size_t three_or_more = 3;
static inline std::size_t apply(Range const& range) static inline std::size_t apply(Range const& range)
{ {
typedef typename point_type<Range>::type point; typedef typename point_type<Range>::type point;
@ -54,7 +49,7 @@ struct number_of_distinct_points
std::size_t size = boost::size(range); std::size_t size = boost::size(range);
if ( size < two ) if ( size < 2u )
{ {
return size; return size;
} }
@ -66,7 +61,7 @@ struct number_of_distinct_points
if ( it1 == boost::end(range) ) if ( it1 == boost::end(range) )
{ {
return one; return 1u;
} }
iterator it2 = iterator it2 =
@ -76,9 +71,9 @@ struct number_of_distinct_points
( it2 == boost::end(range) ( it2 == boost::end(range)
|| geometry::equals(range::front(range), *it2) ) || geometry::equals(range::front(range), *it2) )
? ?
two 2u
: :
three_or_more 3u
; ;
} }
}; };
@ -93,12 +88,12 @@ struct is_valid_linestring
std::size_t linestring_size = num_distinct::apply(linestring); std::size_t linestring_size = num_distinct::apply(linestring);
if ( linestring_size < num_distinct::two ) if ( linestring_size < 2u )
{ {
return false; return false;
} }
if ( !AllowSpikes && linestring_size == num_distinct::two ) if ( !AllowSpikes && linestring_size == 2u )
{ {
return !geometry::equals(range::front(linestring), return !geometry::equals(range::front(linestring),
range::back(linestring)); range::back(linestring));