From ab7a2451616c6c69f6bbae8a3daa6e87a03c5ac5 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Wed, 4 Jan 2017 08:47:32 +0100 Subject: [PATCH] Cancel useless changes in BGL and Surface_mesh --- BGL/examples/BGL_surface_mesh/connected_components.cpp | 2 +- BGL/examples/BGL_surface_mesh/prim.cpp | 2 +- BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp | 4 ++-- Surface_mesh/examples/Surface_mesh/sm_bgl.cpp | 2 +- Surface_mesh/examples/Surface_mesh/sm_join.cpp | 2 +- Surface_mesh/examples/Surface_mesh/sm_memory.cpp | 2 +- Surface_mesh/examples/Surface_mesh/sm_properties.cpp | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BGL/examples/BGL_surface_mesh/connected_components.cpp b/BGL/examples/BGL_surface_mesh/connected_components.cpp index 17e5dfcdfa0..9923c25a44a 100644 --- a/BGL/examples/BGL_surface_mesh/connected_components.cpp +++ b/BGL/examples/BGL_surface_mesh/connected_components.cpp @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) std::ifstream in((argc>1)?argv[1]:"data/prim.off"); in >> sm; - CGAL::Properties::Property_map ccmap; + Mesh::Property_map ccmap; ccmap = sm.add_property_map("v:CC").first; int num = connected_components(sm, ccmap); diff --git a/BGL/examples/BGL_surface_mesh/prim.cpp b/BGL/examples/BGL_surface_mesh/prim.cpp index 5362d44bf97..9a3e2d200ef 100644 --- a/BGL/examples/BGL_surface_mesh/prim.cpp +++ b/BGL/examples/BGL_surface_mesh/prim.cpp @@ -19,7 +19,7 @@ int main(int, char* argv[]) //std::cin >> P; std::ifstream in(argv[1]); in >> P; - CGAL::Properties::Property_map predecessor; + Mesh::Property_map predecessor; predecessor = P.add_property_map("v:predecessor").first; boost::prim_minimum_spanning_tree(P, predecessor, boost::root_vertex(*vertices(P).first)); diff --git a/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp b/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp index 5252fb84f9d..b6940117c83 100644 --- a/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp +++ b/BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp @@ -68,7 +68,7 @@ int main(int argc, char* argv[]) } // the storage of a property map is in primal - CGAL::Properties::Property_map fccmap; + Mesh::Property_map fccmap; fccmap = primal.add_property_map("f:CC").first; int num = connected_components(finite_dual, fccmap); @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) std::cout << f << " in connected component " << fccmap[f] << std::endl; } - CGAL::Properties::Property_map vccmap; + Mesh::Property_map vccmap; vccmap = primal.add_property_map("v:CC").first; num = connected_components(primal, vccmap); diff --git a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp index f1961523fb5..f7fd97f6894 100644 --- a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp +++ b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp @@ -21,7 +21,7 @@ int main(int /* argc */, char* argv[]) Mesh sm; std::ifstream in(argv[1]); in >> sm; - CGAL::Properties::Property_map predecessor; + Mesh::Property_map predecessor; predecessor = sm.add_property_map("v:predecessor").first; boost::prim_minimum_spanning_tree(sm, predecessor, boost::root_vertex(*vertices(sm).first)); diff --git a/Surface_mesh/examples/Surface_mesh/sm_join.cpp b/Surface_mesh/examples/Surface_mesh/sm_join.cpp index 22b840de9f0..c892bfc4cd9 100644 --- a/Surface_mesh/examples/Surface_mesh/sm_join.cpp +++ b/Surface_mesh/examples/Surface_mesh/sm_join.cpp @@ -19,7 +19,7 @@ int main(int argc, char* argv[]) std::ifstream in2((argc>2)?argv[2]:"data/quad.off"); - CGAL::Properties::Property_map name1, name2; + Mesh::Property_map name1, name2; bool created; sm1.add_property_map("v:weight",7812); boost::tie(name1, created) = sm1.add_property_map("v:name","hello"); diff --git a/Surface_mesh/examples/Surface_mesh/sm_memory.cpp b/Surface_mesh/examples/Surface_mesh/sm_memory.cpp index fd9789d264f..918767f523d 100644 --- a/Surface_mesh/examples/Surface_mesh/sm_memory.cpp +++ b/Surface_mesh/examples/Surface_mesh/sm_memory.cpp @@ -31,7 +31,7 @@ int main() } // The status of being used or removed is stored in a property map - CGAL::Properties::Property_map removed + Mesh::Property_map removed = m.property_map("v:removed").first; diff --git a/Surface_mesh/examples/Surface_mesh/sm_properties.cpp b/Surface_mesh/examples/Surface_mesh/sm_properties.cpp index 72df5688300..d2ead0406a4 100644 --- a/Surface_mesh/examples/Surface_mesh/sm_properties.cpp +++ b/Surface_mesh/examples/Surface_mesh/sm_properties.cpp @@ -26,7 +26,7 @@ int main() // give each vertex a name, the default is empty - CGAL::Properties::Property_map name; + Mesh::Property_map name; bool created; boost::tie(name, created) = m.add_property_map("v:name",""); assert(created); @@ -36,20 +36,20 @@ int main() { // You get an existing property, and created will be false - CGAL::Properties::Property_map name; + Mesh::Property_map name; bool created; boost::tie(name, created) = m.add_property_map("v:name", ""); assert(! created); } // You can't get a property that does not exist - CGAL::Properties::Property_map gnus; + Mesh::Property_map gnus; bool found; boost::tie(gnus, found) = m.property_map("v:gnus"); assert(! found); // retrieve the point property for which exists a convenience function - CGAL::Properties::Property_map location = m.points(); + Mesh::Property_map location = m.points(); BOOST_FOREACH( vertex_descriptor vd, m.vertices()) { std::cout << name[vd] << " @ " << location[vd] << std::endl; }