Skip to content

Replace BOOST_FOREACH with C++11 for #3978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lrineau merged 2 commits into from
Jun 17, 2019
Merged

Replace BOOST_FOREACH with C++11 for #3978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e1f2cf
Replace BOOST_FOREACH with C++11 for
afabri Jun 4, 2019
b17b655
Add for
afabri Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Polyhedron_IO/include/CGAL/IO/PLY_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
12 changes: 5 additions & 7 deletions Stream_support/include/CGAL/IO/WKT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
for(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());
Expand Down
10 changes: 5 additions & 5 deletions Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,7 @@ class Surface_mesh

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)
{
Expand All @@ -2248,11 +2248,11 @@ class Surface_mesh

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)
Expand Down Expand Up @@ -2285,7 +2285,7 @@ class Surface_mesh

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)) << " ";
Expand All @@ -2311,7 +2311,7 @@ class Surface_mesh

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)) << " ";
Expand Down