Subject: [Boost-commit] svn:boost r73120 - trunk/boost/geometry/algorithms/detail/overlay
From: barend.gehrels_at_[hidden]
Date: 2011-07-15 12:45:02
Author: barendgehrels
Date: 2011-07-15 12:45:01 EDT (Fri, 15 Jul 2011)
New Revision: 73120
URL: http://svn.boost.org/trac/boost/changeset/73120
Log:
Removed (obsolete) usage of within_code in assign_parents
Text files modified:
trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
Modified: trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp 2011-07-15 12:45:01 EDT (Fri, 15 Jul 2011)
@@ -42,23 +42,22 @@
typedef typename geometry::tag<Geometry1>::type tag1;
typedef typename geometry::tag<Geometry2>::type tag2;
- int code = -1;
switch (ring_id.source_index)
{
case 0 :
- code = within_code(item2.point,
+ return geometry::within(item2.point,
get_ring<tag1>::apply(ring_id, geometry1));
break;
case 1 :
- code = within_code(item2.point,
+ return geometry::within(item2.point,
get_ring<tag2>::apply(ring_id, geometry2));
break;
case 2 :
- code = within_code(item2.point,
+ return geometry::within(item2.point,
get_ring<void>::apply(ring_id, collection));
break;
}
- return code == 1;
+ return false;
}