Replace BOOST_FOREACH with C++11 for

This commit is contained in:
Andreas Fabri 2019-06-04 17:13:53 +02:00
parent 7fc36ad2a5
commit 4e1f2cf017
3 changed files with 11 additions and 13 deletions

View File

@ -142,7 +142,7 @@ namespace CGAL{
if(has_texture)
{
BOOST_FOREACH(halfedge_descriptor hd, halfedges(mesh))
for(halfedge_descriptor hd : halfedges(mesh))
{
typedef std::tuple<unsigned int, unsigned int, float, float> Super_tuple;
Super_tuple t =

View File

@ -33,8 +33,6 @@
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#include <boost/foreach.hpp>
#include <CGAL/IO/traits_point.h>
#include <CGAL/IO/traits_point_3.h>
@ -157,7 +155,7 @@ read_multi_linestring_WKT( std::istream& in,
break;
}
}
BOOST_FOREACH(LineString& ls, gc)
for(LineString& ls : gc)
{
mls.push_back(*ls.range);
}
@ -312,7 +310,7 @@ write_multi_linestring_WKT( std::ostream& out,
typedef typename MultiLineString::value_type PointRange;
typedef internal::Geometry_container<PointRange, boost::geometry::linestring_tag> LineString;
std::vector<LineString> pr_range;
BOOST_FOREACH(PointRange& pr, mls)
for(PointRange& pr : mls)
{
LineString ls(pr);
pr_range.push_back(ls);
@ -374,21 +372,21 @@ read_WKT( std::istream& input,
{
MultiPoint mp;
CGAL::read_multi_point_WKT(input, mp);
BOOST_FOREACH(const Point& point, mp)
for(const Point& point : mp)
points.push_back(point);
}
else if(type == "MULTILINESTRING")
{
MultiLineString mls;
CGAL::read_multi_linestring_WKT(input, mls);
BOOST_FOREACH(const LineString& ls, mls)
(const LineString& ls : mls)
polylines.push_back(ls);
}
else if(type == "MULTIPOLYGON")
{
MultiPolygon mp;
CGAL::read_multi_polygon_WKT(input, mp);
BOOST_FOREACH(const Polygon& poly, mp)
for(const Polygon& poly : mp)
polygons.push_back(poly);
}
}while(input.good() && !input.eof());

View File

@ -2234,7 +2234,7 @@ private: //------------------------------------------------------- private data
os << "end_header" << std::endl;
BOOST_FOREACH(VIndex vi, sm.vertices())
for(VIndex vi : sm.vertices())
{
for (std::size_t i = 0; i < vprinters.size(); ++ i)
{
@ -2248,11 +2248,11 @@ private: //------------------------------------------------------- private data
std::vector<VIndex> polygon;
BOOST_FOREACH(FIndex fi, sm.faces())
for(FIndex fi : sm.faces())
{
// Get list of vertex indices
polygon.clear();
BOOST_FOREACH(HIndex hi, halfedges_around_face(halfedge(fi, sm), sm))
for(HIndex hi : halfedges_around_face(halfedge(fi, sm), sm))
polygon.push_back (sm.target(hi));
if (get_mode (os) == IO::ASCII)
@ -2285,7 +2285,7 @@ private: //------------------------------------------------------- private data
if (!eprinters.empty())
{
BOOST_FOREACH(EIndex ei, sm.edges())
for(EIndex ei : sm.edges())
{
if (get_mode (os) == IO::ASCII)
os << int(sm.vertex(ei,0)) << " " << int(sm.vertex(ei,1)) << " ";
@ -2311,7 +2311,7 @@ private: //------------------------------------------------------- private data
if (!hprinters.empty())
{
BOOST_FOREACH(HIndex hi, sm.halfedges())
for(HIndex hi : sm.halfedges())
{
if (get_mode (os) == IO::ASCII)
os << int(sm.source(hi)) << " " << int(sm.target(hi)) << " ";