songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

This commit is contained in:
Maxime Gimeno 2017-06-14 09:32:13 +02:00
parent b629a9e9e3
commit bd45c39ef3
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h
View File

@ -142,7 +142,7 @@ inline get(CGAL::face_patch_id_t<I>, Surface_mesh<P> & smesh)
template <typename P> template <typename P>
CGAL_MESH_3_PROPERTY_SURFACE_MESH_RETURN_TYPE(CGAL::face_patch_id_t<void>) CGAL_MESH_3_PROPERTY_SURFACE_MESH_RETURN_TYPE(CGAL::face_patch_id_t<void>)
inline get(CGAL::face_patch_id_t<void>, Surface_mesh<P> & smesh) inline get(CGAL::face_patch_id_t<void>, Surface_mesh<P> &)
{ {
typedef CGAL::Static_property_map<typename boost::graph_traits<Surface_mesh<P> >::face_descriptor,std::pair<int,int> > Pmap; typedef CGAL::Static_property_map<typename boost::graph_traits<Surface_mesh<P> >::face_descriptor,std::pair<int,int> > Pmap;

1
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp
View File

@ -81,7 +81,6 @@ public Q_SLOTS:
private: private:
typedef CGAL::Three::Scene_interface::Item_id Item_id; typedef CGAL::Three::Scene_interface::Item_id Item_id;
std::vector<QColor> saved_color; std::vector<QColor> saved_color;
bool is_color_vector_read_only;
Scene_edit_polyhedron_item* convert_to_edit_facegraph(Item_id, Scene_facegraph_item*); 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*); Scene_facegraph_item* convert_to_plain_facegraph(Item_id, Scene_edit_polyhedron_item*);
void updateSelectionItems(Scene_facegraph_item* target); void updateSelectionItems(Scene_facegraph_item* target);

2
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
View File

@ -785,7 +785,7 @@ public:
poly_item->setItemIsMulticolor(b); poly_item->setItemIsMulticolor(b);
} }
void selection_changed(bool b) Q_DECL_OVERRIDE; void selection_changed(bool b);
Q_SIGNALS: Q_SIGNALS:
void updateInstructions(QString); void updateInstructions(QString);

3
Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h
View File

@ -58,7 +58,6 @@ public:
std::vector<QColor>& color_vector(); std::vector<QColor>& color_vector();
void show_feature_edges(bool); void show_feature_edges(bool);
virtual void drawEdges() const {}
SMesh* polyhedron(); SMesh* polyhedron();
const SMesh* polyhedron() const; const SMesh* polyhedron() const;
@ -89,7 +88,7 @@ public Q_SLOTS:
double orig_z, double orig_z,
double dir_x, double dir_x,
double dir_y, double dir_y,
double dir_z); double dir_z) Q_DECL_OVERRIDE;
bool intersect_face(double orig_x, bool intersect_face(double orig_x,
double orig_y, double orig_y,
double orig_z, double orig_z,