From efdd6c5a26d1a9d90135acb0a507223e406b6aff Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 11 Apr 2016 18:31:38 +0200 Subject: [PATCH] Remove warnings and errors --- .../examples/Combinatorial_map/map_3_dynamic_onmerge.cpp | 4 ++-- .../examples/Combinatorial_map/map_3_foreach.cpp | 4 ++-- .../include/CGAL/Combinatorial_map_operations.h | 8 ++++---- .../Combinatorial_map_deprecated_test.cpp | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp b/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp index 5d4d9892501..f446f3e0525 100644 --- a/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp +++ b/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp @@ -87,8 +87,8 @@ int main() CMap_3 cm; // 0) Create 2 hexahedra. - Dart_handle dh1 = CGAL::make_combinatorial_hexahedron(cm); - Dart_handle dh2 = CGAL::make_combinatorial_hexahedron(cm); + Dart_handle dh1 = cm.make_combinatorial_hexahedron(); + Dart_handle dh2 = cm.make_combinatorial_hexahedron(); // 1) Create 2-attributes of the first hexahedron, info()==7. for (CMap_3::One_dart_per_incident_cell_range<2, 3>::iterator diff --git a/Combinatorial_map/examples/Combinatorial_map/map_3_foreach.cpp b/Combinatorial_map/examples/Combinatorial_map/map_3_foreach.cpp index d266dab5b0f..cbad09ce071 100644 --- a/Combinatorial_map/examples/Combinatorial_map/map_3_foreach.cpp +++ b/Combinatorial_map/examples/Combinatorial_map/map_3_foreach.cpp @@ -71,8 +71,8 @@ int main() CMap_3 cmap; // Create two tetrahedra. - Dart_handle d1 = CGAL::make_combinatorial_tetrahedron(cmap); - Dart_handle d2 = CGAL::make_combinatorial_tetrahedron(cmap); + Dart_handle d1 = cmap.make_combinatorial_tetrahedron(); + Dart_handle d2 = cmap.make_combinatorial_tetrahedron(); // Display the vertices of each volume by iterating on darts. std::cout<<"********Volumes********"<(adart)) ); + CGAL_assertion( (amap.template is_removable(adart)) ); size_t res = 0; @@ -353,7 +353,7 @@ namespace CGAL static size_t run(CMap& amap, typename CMap::Dart_handle adart, bool update_attributes) { - CGAL_assertion( (amap.is_removable<0>(adart)) ); + CGAL_assertion( (amap.template is_removable<0>(adart)) ); size_t res = 0; @@ -547,7 +547,7 @@ namespace CGAL bool update_attributes) { CGAL_static_assertion ( 2<=i && i<=CMap::dimension ); - CGAL_assertion( (amap.is_contractible(adart)) ); + CGAL_assertion( (amap.template is_contractible(adart)) ); size_t res = 0; @@ -703,7 +703,7 @@ namespace CGAL static size_t run(CMap& amap, typename CMap::Dart_handle adart, bool update_attributes) { - CGAL_assertion( (amap.is_contractible<1>(adart)) ); + CGAL_assertion( (amap.template is_contractible<1>(adart)) ); size_t res = 0; diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_deprecated_test.cpp b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_deprecated_test.cpp index 0fa00d343a9..e26fd033467 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_deprecated_test.cpp +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_deprecated_test.cpp @@ -22,9 +22,9 @@ bool test() for ( int i=0; i<20; ++i ) { - typename CMap::Dart_handle d1=map.darts().begin(); + CMap::Dart_handle d1=map.darts().begin(); while ( !map.template is_free<3>(d1) ) ++d1; - typename CMap::Dart_handle d2=map.darts().begin(); + CMap::Dart_handle d2=map.darts().begin(); while ( !map.template is_sewable<3>(d1, d2) ) ++d2; map.template sew<3>(d1,d2); @@ -40,7 +40,7 @@ bool test() else if (CGAL::is_contractible(map, d1)) CGAL::contract_cell(map, d1, true); - typename CMap::Dart_handle d3=CGAL::insert_cell_0_in_cell_1(map, d2); + CMap::Dart_handle d3=CGAL::insert_cell_0_in_cell_1(map, d2); CGAL::insert_cell_0_in_cell_2(map, d2); CGAL::insert_dangling_cell_1_in_cell_2(map, d2);