songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polyhedron_IO/include/CGAL/IO/PLY_writer.h
View File

@ -142,7 +142,7 @@ namespace CGAL{
if(has_texture) 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; typedef std::tuple<unsigned int, unsigned int, float, float> Super_tuple;
Super_tuple t = Super_tuple t =

12
Stream_support/include/CGAL/IO/WKT.h
View File

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

10
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

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