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

Changed BOOST_AUTO to BOOST_AUTO_TPL for pgi 11.2

Browse Source 
[SVN r70060]
This commit is contained in:
Barend Gehrels
2011-03-17 14:02:01 +00:00
parent 2b03e95bc1
commit 05186e267d
26 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/geometry/algorithms/centroid.hpp
View File

@@ -281,7 +281,7 @@ struct centroid_polygon_state
typename interior_return_type<Polygon const>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
per_ring::apply(*it, strategy, state);
}

6
include/boost/geometry/algorithms/correct.hpp
View File

@@ -167,7 +167,7 @@ struct correct_polygon
typename interior_return_type<Polygon>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
correct_ring
<
@@ -221,8 +221,8 @@ template <typename Ring>
struct correct<ring_tag, Ring>
: detail::correct::correct_ring
<
Ring,
std::less<typename coordinate_type<Ring>::type>
Ring,
std::less<typename coordinate_type<Ring>::type>
>
{};

2
include/boost/geometry/algorithms/detail/calculate_sum.hpp
View File

@@ -33,7 +33,7 @@ class calculate_polygon_sum
static inline ReturnType sum_interior_rings(Rings const& rings, Strategy const& strategy)
{
ReturnType sum = ReturnType();
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
sum += Policy::apply(*it, strategy);
}

2
include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
View File

@@ -183,7 +183,7 @@ struct polygon_collect_vectors
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
per_range::apply(collection, *it);
}

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

@@ -355,8 +355,8 @@ struct section_visitor
Turns& m_turns;
InterruptPolicy& m_interrupt_policy;
section_visitor(int id1, Geometry1 const& g1,
int id2, Geometry2 const& g2,
section_visitor(int id1, Geometry1 const& g1,
int id2, Geometry2 const& g2,
Turns& turns, InterruptPolicy& ip)
: m_source_id1(id1), m_geometry1(g1)
, m_source_id2(id2), m_geometry2(g2)
@@ -637,7 +637,7 @@ struct get_turns_polygon_cs
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings);
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings);
++it, ++i)
{
intersector_type::apply(

12
include/boost/geometry/algorithms/detail/overlay/select_rings.hpp
View File

@@ -87,7 +87,7 @@ namespace dispatch
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
id.ring_index++;
per_ring::apply(*it, geometry, id, map);
@@ -104,7 +104,7 @@ namespace dispatch
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
id.ring_index++;
per_ring::apply(*it, id, map);
@@ -173,13 +173,13 @@ template
overlay_type OverlayType,
typename IntersectionMap, typename SelectionMap
>
inline void update_selection_map(IntersectionMap const& intersection_map,
inline void update_selection_map(IntersectionMap const& intersection_map,
SelectionMap const& map_with_all, SelectionMap& selection_map)
{
selection_map.clear();
for (typename SelectionMap::const_iterator it = boost::begin(map_with_all);
it != boost::end(map_with_all);
for (typename SelectionMap::const_iterator it = boost::begin(map_with_all);
it != boost::end(map_with_all);
++it)
{
/*
@@ -234,7 +234,7 @@ inline void select_rings(Geometry1 const& geometry1, Geometry2 const& geometry2,
template
<
overlay_type OverlayType,
typename Geometry,
typename Geometry,
typename IntersectionMap, typename SelectionMap
>
inline void select_rings(Geometry const& geometry,

4
include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
View File

@@ -359,7 +359,7 @@ struct sectionalize_range
Reverse ? iterate_reverse : iterate_forward
>::type view_type;
static inline void apply(Range const& range, Sections& sections,
static inline void apply(Range const& range, Sections& sections,
ring_identifier ring_id)
{
typedef model::referring_segment<Point const> segment_type;
@@ -428,7 +428,7 @@ struct sectionalize_polygon
ring_id.ring_index++;
typename interior_return_type<Polygon const>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings);
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings);
++it, ++ring_id.ring_index)
{
sectionalizer_type::apply(*it, sections, ring_id);

2
include/boost/geometry/algorithms/distance.hpp
View File

@@ -211,7 +211,7 @@ struct point_to_polygon
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
distance_containment dcr = per_ring::apply(point,
*it, pp_strategy, ps_strategy);

8
include/boost/geometry/algorithms/for_each.hpp
View File

@@ -82,8 +82,8 @@ struct fe_range_per_segment
typename point_type<Range>::type
>::type point_type;
BOOST_AUTO(it, boost::begin(range));
BOOST_AUTO(previous, it++);
BOOST_AUTO_TPL(it, boost::begin(range));
BOOST_AUTO_TPL(previous, it++);
while(it != boost::end(range))
{
model::referring_segment<point_type> s(*previous, *it);
@@ -114,7 +114,7 @@ struct fe_polygon_per_point
typename interior_return_type<poly_type>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
f = per_ring::apply(*it, f);
}
@@ -143,7 +143,7 @@ struct fe_polygon_per_segment
typename interior_return_type<poly_type>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
f = per_ring::apply(*it, f);
}

2
include/boost/geometry/algorithms/num_points.hpp
View File

@@ -77,7 +77,7 @@ struct polygon_count
typename interior_return_type<Polygon const>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
n += range_count<ring_type>::apply(*it, add_for_open);
}

2
include/boost/geometry/algorithms/reverse.hpp
View File

@@ -48,7 +48,7 @@ struct polygon_reverse
typename interior_return_type<Polygon>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
per_range::apply(*it);
}

4
include/boost/geometry/algorithms/simplify.hpp
View File

@@ -144,8 +144,8 @@ struct simplify_polygon
= interior_rings(poly_in);
typename interior_return_type<Polygon>::type rings_out
= interior_rings(poly_out);
BOOST_AUTO(it_out, boost::begin(rings_out));
for (BOOST_AUTO(it_in, boost::begin(rings_in));
BOOST_AUTO_TPL(it_out, boost::begin(rings_out));
for (BOOST_AUTO_TPL(it_in, boost::begin(rings_in));
it_in != boost::end(rings_in);
++it_in, ++it_out)
{

6
include/boost/geometry/algorithms/transform.hpp
View File

@@ -100,7 +100,7 @@ struct transform_box_or_segment
assign_point_from_index<1>(source, source_point[1]);
point_type2 target_point[2];
if (strategy.apply(source_point[0], target_point[0])
if (strategy.apply(source_point[0], target_point[0])
&& strategy.apply(source_point[1], target_point[1]))
{
assign_point_to_index<0>(target_point[0], target);
@@ -174,8 +174,8 @@ struct transform_polygon
= interior_rings(poly1);
typename interior_return_type<Polygon2>::type rings2
= interior_rings(poly2);
BOOST_AUTO(it1, boost::begin(rings1));
BOOST_AUTO(it2, boost::begin(rings2));
BOOST_AUTO_TPL(it1, boost::begin(rings1));
BOOST_AUTO_TPL(it2, boost::begin(rings2));
for ( ; it1 != boost::end(interior_rings(poly1)); ++it1, ++it2)
{
if (!transform_range_out<point2_type>(*it1,

2
include/boost/geometry/algorithms/unique.hpp
View File

@@ -58,7 +58,7 @@ struct polygon_unique
typename interior_return_type<Polygon>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
per_range::apply(*it, policy);
}

2
include/boost/geometry/algorithms/within.hpp
View File

@@ -219,7 +219,7 @@ struct point_in_polygon
{
typename interior_return_type<Polygon const>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings));
for (BOOST_AUTO_TPL(it, boost::begin(rings));
it != boost::end(rings);
++it)
{

2
include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp
View File

@@ -171,7 +171,7 @@ struct wkt_poly
typename interior_return_type<Polygon const>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
os << ",";
wkt_sequence<ring>::apply(os, *it);

2
include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp
View File

@@ -206,7 +206,7 @@ struct polygon_buffer
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings); it != boost::end(rings); ++it)
{
output_ring_type ring;
policy::apply(*it, ring, distance, join_strategy

4
include/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp
View File

@@ -186,7 +186,7 @@ struct insert_rings<polygon_tag, RingCollection, Polygon>
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
#ifdef BOOST_GEOMETRY_DEBUG_SPLIT_RINGS
std::cout << geometry::wkt(*it)
@@ -494,7 +494,7 @@ struct polygon_split_rings
static inline void apply(Polygon const& polygon, RingCollection& ring_collection)
{
per_ring::apply(exterior_ring(polygon), ring_collection);
for (BOOST_AUTO(it, boost::begin(interior_rings(polygon)));
for (BOOST_AUTO_TPL(it, boost::begin(interior_rings(polygon)));
it != boost::end(interior_rings(polygon));
++it)
{

2
include/boost/geometry/extensions/algorithms/mark_spikes.hpp
View File

@@ -363,7 +363,7 @@ struct polygon_mark_spikes
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
// Interior ring (zero based)
id.ring_index++;

12
include/boost/geometry/extensions/algorithms/remove_marked.hpp
View File

@@ -46,7 +46,7 @@ struct range_remove_marked
typedef typename coordinate_type<Range>::type coordinate_type;
static inline void apply(Range const& range_in, ring_identifier id,
static inline void apply(Range const& range_in, ring_identifier id,
Range& range_out, MarkMap const& mark_map)
{
typename MarkMap::const_iterator mit = mark_map.find(id);
@@ -82,7 +82,7 @@ struct range_remove_marked
template <typename Polygon, typename MarkMap>
struct polygon_remove_marked
{
static inline void apply(Polygon const& polygon_in, ring_identifier id,
static inline void apply(Polygon const& polygon_in, ring_identifier id,
Polygon& polygon_out, MarkMap const& mark_map)
{
typedef typename geometry::ring_type<Polygon>::type ring_type;
@@ -98,10 +98,10 @@ struct polygon_remove_marked
= interior_rings(polygon_out);
rings_out.resize(boost::size(interior_rings(polygon_in)));
BOOST_AUTO(out, boost::begin(rings_out));
BOOST_AUTO_TPL(out, boost::begin(rings_out));
for (BOOST_AUTO(it, boost::begin(rings_in));
it != boost::end(rings_in);
for (BOOST_AUTO_TPL(it, boost::begin(rings_in));
it != boost::end(rings_in);
++it, ++out)
{
id.ring_index++;
@@ -114,7 +114,7 @@ struct polygon_remove_marked
template <typename MultiGeometry, typename MarkMap, typename SinglePolicy>
struct multi_remove_marked
{
static inline void apply(MultiGeometry const& multi_in, ring_identifier id,
static inline void apply(MultiGeometry const& multi_in, ring_identifier id,
MultiGeometry& multi_out, MarkMap const& mark_map)
{
id.multi_index = 0;

2
include/boost/geometry/extensions/algorithms/remove_spikes.hpp
View File

@@ -132,7 +132,7 @@ struct polygon_remove_spikes
typename interior_return_type<Polygon>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
per_range::apply(*it, policy);
}

2
include/boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp
View File

@@ -103,7 +103,7 @@ struct shape_create_polygon
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
parts[ring++] = offset;
offset = range_to_part(*it, xp, yp, offset);

4
include/boost/geometry/extensions/io/svg/write_svg.hpp
View File

@@ -134,11 +134,11 @@ struct svg_poly
{
typename interior_return_type<Polygon const>::type rings
= interior_rings(polygon);
for (BOOST_AUTO(rit, boost::begin(rings));
for (BOOST_AUTO_TPL(rit, boost::begin(rings));
rit != boost::end(rings); ++rit)
{
first = true;
for (BOOST_AUTO(it, boost::begin(*rit)); it != boost::end(*rit);
for (BOOST_AUTO_TPL(it, boost::begin(*rit)); it != boost::end(*rit);
++it, first = false)
{
os << (first ? "M" : " L") << " "

2
include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
View File

@@ -34,7 +34,7 @@ struct fe_range_multi
typename add_const_if_c<IsConst, Multi>::type& multi,
Actor& actor)
{
for(BOOST_AUTO(it, boost::begin(multi)); it != boost::end(multi); ++it)
for(BOOST_AUTO_TPL(it, boost::begin(multi)); it != boost::end(multi); ++it)
{
geometry::detail::for_each_range(*it, actor);
}

2
include/boost/geometry/multi/algorithms/for_each.hpp
View File

@@ -43,7 +43,7 @@ struct for_each_multi
typename add_const_if_c<IsConst, MultiGeometry>::type& multi,
Functor f)
{
for(BOOST_AUTO(it, boost::begin(multi)); it != boost::end(multi); ++it)
for(BOOST_AUTO_TPL(it, boost::begin(multi)); it != boost::end(multi); ++it)
{
f = Policy::apply(*it, f);
}

2
include/boost/geometry/util/write_dsv.hpp
View File

@@ -214,7 +214,7 @@ struct dsv_poly
typename interior_return_type<Polygon const>::type rings
= interior_rings(poly);
for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it)
for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
os << settings.list_separator;
dsv_range<ring>::apply(os, *it, settings);