From bd45c39ef398c33d548d00f11d56d771b32a3201 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 14 Jun 2017 09:32:13 +0200 Subject: [PATCH] Fix warnings --- Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h | 2 +- .../Surface_mesh_deformation/Edit_polyhedron_plugin.cpp | 1 - Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h | 2 +- Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h b/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h index 8e5668c2d4e..11018218e7a 100644 --- a/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h +++ b/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h @@ -142,7 +142,7 @@ inline get(CGAL::face_patch_id_t, Surface_mesh

& smesh) template CGAL_MESH_3_PROPERTY_SURFACE_MESH_RETURN_TYPE(CGAL::face_patch_id_t) -inline get(CGAL::face_patch_id_t, Surface_mesh

& smesh) +inline get(CGAL::face_patch_id_t, Surface_mesh

&) { typedef CGAL::Static_property_map >::face_descriptor,std::pair > Pmap; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp index 89b4fd0ccfe..8493ea9ed47 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp @@ -81,7 +81,6 @@ public Q_SLOTS: private: typedef CGAL::Three::Scene_interface::Item_id Item_id; std::vector saved_color; - bool is_color_vector_read_only; Scene_edit_polyhedron_item* convert_to_edit_facegraph(Item_id, Scene_facegraph_item*); Scene_facegraph_item* convert_to_plain_facegraph(Item_id, Scene_edit_polyhedron_item*); void updateSelectionItems(Scene_facegraph_item* target); diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h index 0adb4362940..0c4678759b1 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h @@ -785,7 +785,7 @@ public: poly_item->setItemIsMulticolor(b); } - void selection_changed(bool b) Q_DECL_OVERRIDE; + void selection_changed(bool b); Q_SIGNALS: void updateInstructions(QString); diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h index ac1520f5a84..ed6084f735c 100644 --- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h @@ -58,7 +58,6 @@ public: std::vector& color_vector(); void show_feature_edges(bool); - virtual void drawEdges() const {} SMesh* polyhedron(); const SMesh* polyhedron() const; @@ -89,7 +88,7 @@ public Q_SLOTS: double orig_z, double dir_x, double dir_y, - double dir_z); + double dir_z) Q_DECL_OVERRIDE; bool intersect_face(double orig_x, double orig_y, double orig_z,