Merge pull request #185 from sloriot/Polygon_mesh_processing-GF

Fix warnings in Polygon_mesh_processing

Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp

@@ -31,7 +31,7 @@ int main(int argc, char** argv)
     std::back_inserter(intersected_tris),
     CGAL::Polygon_mesh_processing::parameters::vertex_index_map(get(CGAL::vertex_point, m)));
   bool intersecting_1 = !intersected_tris.empty();
-  CGAL_assertion(!intersecting_1);
+  assert(!intersecting_1);
 
   std::cerr << "self_intersections test took " << timer.time() << " sec." << std::endl;
   std::cerr << intersected_tris.size() << " pairs of triangles are intersecting." << std::endl;
@@ -40,7 +40,7 @@ int main(int argc, char** argv)
   bool intersecting_2 = CGAL::Polygon_mesh_processing::does_self_intersect(m,
     CGAL::Polygon_mesh_processing::parameters::vertex_index_map(get(CGAL::vertex_point, m)));
   
-  CGAL_assertion(intersecting_1 == intersecting_2);
+  assert(intersecting_1 == intersecting_2);
 
   std::cerr << "does_self_intersect test took " << timer.time() << " sec." << std::endl;
   std::cerr

Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp

@@ -58,7 +58,7 @@ void detect_borders(Polyhedron& poly, std::vector<Halfedge_handle>& border_reps)
       Halfedge_around_facet_circulator hf_around_facet(h,poly), done(hf_around_facet);
       do {
         bool insertion_ok = border_map.insert(*hf_around_facet).second;
-        CGAL_assertion(insertion_ok);
+        assert(insertion_ok);
       } while(++hf_around_facet != done);
     }
   }
@@ -135,13 +135,13 @@ void test_triangulate_hole(const char* file_name) {
     CGAL::Polygon_mesh_processing::triangulate_hole(poly, *it, back_inserter(patch));
     if(patch.empty()) {
       std::cerr << "  Error: empty patch created." << std::endl;
-      CGAL_assertion(false);
+      assert(false);
     }
   }
 
   if(!poly.is_valid() || ! is_closed(poly)) {
     std::cerr << "  Error: patched polyhedron is not valid or closed." << std::endl;
-    CGAL_assertion(false);
+    assert(false);
   }
   
   std::cout << "  Done!" << std::endl;

Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp

@@ -57,7 +57,7 @@ void detect_borders(Polyhedron& poly, std::vector<Halfedge_handle>& border_reps)
       Halfedge_around_facet_circulator hf_around_facet(h,poly), done(hf_around_facet);
       do {
         bool insertion_ok = border_map.insert(*hf_around_facet).second;
-        CGAL_assertion(insertion_ok);
+        assert(insertion_ok);
       } while(++hf_around_facet != done);
     }
   }
@@ -146,13 +146,13 @@ void test_triangulate_hole(const char* file_name) {
     CGAL::Polygon_mesh_processing::triangulate_hole(poly, *it, back_inserter(patch));
     if(patch.empty()) {
       std::cerr << "  Error: empty patch created." << std::endl;
-      CGAL_assertion(false);
+      assert(false);
     }
   }
 
   if(!poly.is_valid() || ! is_closed(poly)) {
     std::cerr << "  Error: patched polyhedron is not valid or closed." << std::endl;
-    CGAL_assertion(false);
+    assert(false);
   }
   
   std::cout << "  Done!" << std::endl;

Polyhedron/demo/Polyhedron/Polyhedron_demo_hole_filling_plugin.cpp

@@ -504,7 +504,8 @@ void Polyhedron_demo_hole_filling_plugin::on_Fill_selected_holes_button() {
   }
   print_message(tr("%1 of %2 holes are filled!").arg(filled_counter).arg(counter));
   QApplication::restoreOverrideCursor();
-};
+}
+
 // fills all holes and removes associated Scene_hole_visualizer if any
 void Polyhedron_demo_hole_filling_plugin::on_Select_all_holes_button() {
   Scene_hole_visualizer* hole_visualizer = get_selected_item<Scene_hole_visualizer>();

Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp

@@ -433,7 +433,6 @@ Scene_polyhedron_item::compute_normals_and_vertices(void)
     typedef Polyhedron::Traits	    Kernel;
     typedef Kernel::Point_3	    Point;
     typedef Kernel::Vector_3	    Vector;
-    typedef Polyhedron::Facet	    Facet;
     typedef Polyhedron::Facet_iterator Facet_iterator;
     typedef Polyhedron::Halfedge_around_facet_circulator HF_circulator;