diff --git a/Subdivision_method_3/examples/Subdivision_method_3/CatmullClark_subdivision.cpp b/Subdivision_method_3/examples/Subdivision_method_3/CatmullClark_subdivision.cpp index cfaf8938158..8e67d9b5721 100644 --- a/Subdivision_method_3/examples/Subdivision_method_3/CatmullClark_subdivision.cpp +++ b/Subdivision_method_3/examples/Subdivision_method_3/CatmullClark_subdivision.cpp @@ -16,7 +16,7 @@ typedef CGAL::Surface_mesh PolygonMesh; using namespace std; using namespace CGAL; -namespace params = CGAL::Polygon_mesh_processing::parameters; +namespace params = CGAL::parameters; int main(int argc, char** argv) { if (argc > 4) { diff --git a/Subdivision_method_3/examples/Subdivision_method_3/Customized_subdivision.cpp b/Subdivision_method_3/examples/Subdivision_method_3/Customized_subdivision.cpp index dc93f81bc89..3bf1827f04d 100644 --- a/Subdivision_method_3/examples/Subdivision_method_3/Customized_subdivision.cpp +++ b/Subdivision_method_3/examples/Subdivision_method_3/Customized_subdivision.cpp @@ -16,7 +16,7 @@ typedef CGAL::Simple_cartesian Kernel; typedef CGAL::Surface_mesh PolygonMesh; using namespace std; using namespace CGAL; -namespace params = CGAL::Polygon_mesh_processing::parameters; +namespace params = CGAL::parameters; // ====================================================================== template diff --git a/Subdivision_method_3/examples/Subdivision_method_3/DooSabin_subdivision.cpp b/Subdivision_method_3/examples/Subdivision_method_3/DooSabin_subdivision.cpp index 016bf1f8d33..8f1ca92f170 100644 --- a/Subdivision_method_3/examples/Subdivision_method_3/DooSabin_subdivision.cpp +++ b/Subdivision_method_3/examples/Subdivision_method_3/DooSabin_subdivision.cpp @@ -18,7 +18,7 @@ typedef CGAL::Polyhedron_3 PolygonMesh; using namespace std; using namespace CGAL; -namespace params = CGAL::Polygon_mesh_processing::parameters; +namespace params = CGAL::parameters; int main(int argc, char **argv) { if (argc > 4) { diff --git a/Subdivision_method_3/examples/Subdivision_method_3/Loop_subdivision.cpp b/Subdivision_method_3/examples/Subdivision_method_3/Loop_subdivision.cpp index 8298450fdda..0d78bf1deba 100644 --- a/Subdivision_method_3/examples/Subdivision_method_3/Loop_subdivision.cpp +++ b/Subdivision_method_3/examples/Subdivision_method_3/Loop_subdivision.cpp @@ -16,7 +16,7 @@ typedef CGAL::Surface_mesh PolygonMesh; using namespace std; using namespace CGAL; -namespace params = CGAL::Polygon_mesh_processing::parameters; +namespace params = CGAL::parameters; int main(int argc, char **argv) { if (argc > 4) { diff --git a/Subdivision_method_3/examples/Subdivision_method_3/Sqrt3_subdivision.cpp b/Subdivision_method_3/examples/Subdivision_method_3/Sqrt3_subdivision.cpp index 447ae6e1671..4c4d937626c 100644 --- a/Subdivision_method_3/examples/Subdivision_method_3/Sqrt3_subdivision.cpp +++ b/Subdivision_method_3/examples/Subdivision_method_3/Sqrt3_subdivision.cpp @@ -16,7 +16,7 @@ typedef CGAL::Surface_mesh PolygonMesh; using namespace std; using namespace CGAL; -namespace params = CGAL::Polygon_mesh_processing::parameters; +namespace params = CGAL::parameters; int main(int argc, char **argv) { if (argc > 4) { diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h index aa4deb8bb93..e144842f73a 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h @@ -31,8 +31,8 @@ #include -#include -#include +#include +#include #include @@ -46,7 +46,7 @@ namespace Subdivision_method_3 { */ /// @{ -namespace parameters = Polygon_mesh_processing::parameters; +namespace parameters = CGAL::parameters; // ----------------------------------------------------------------------------- diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h index df25d11c0b3..7d2235b1b73 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h @@ -29,8 +29,8 @@ #include -#include -#include +#include +#include #include #include @@ -89,12 +89,12 @@ Catmull-Clark subdivision. */ /// @{ -namespace parameters = Polygon_mesh_processing::parameters; +namespace parameters = CGAL::parameters; // ----------------------------------------------------------------------------- #ifndef DOXYGEN_RUNNING -// backward compatibility +// Backward compatibility template void CatmullClark_subdivision(PolygonMesh& pmesh, int step = 1) { PQQ(pmesh, CatmullClark_mask_3(&pmesh, get(vertex_point,pmesh)), step); diff --git a/Subdivision_method_3/package_info/Subdivision_method_3/dependencies b/Subdivision_method_3/package_info/Subdivision_method_3/dependencies index e79fe5387dd..e85d728f1f7 100644 --- a/Subdivision_method_3/package_info/Subdivision_method_3/dependencies +++ b/Subdivision_method_3/package_info/Subdivision_method_3/dependencies @@ -7,7 +7,6 @@ Interval_support Kernel_23 Modular_arithmetic Number_types -Polygon_mesh_processing Profiling_tools Property_map STL_Extension