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

fixes for gcc

This commit is contained in:
Sébastien Loriot 2013-09-02 15:51:32 +02:00
parent c071cdd704
commit 2997c4fa6a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,8 @@ struct One_ring_iterator<Polyhedron::Vertex_handle> {
bool first;
// to be used in One_ring_iterator<Halfedge_handle>
operator Polyhedron::Halfedge_handle() const {
return &*circ < &*circ->opposite() ? circ : circ->opposite();
if ( &*circ < &*circ->opposite() ) return circ;
return circ->opposite();
}
};

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

@ -14,6 +14,7 @@
#include <iostream>
#include <fstream>
#include <CGAL/glu.h>
#include <QGLViewer/manipulatedFrame.h>
#include <QGLViewer/qglviewer.h>
#include <QGLViewer/camera.h>
@ -22,6 +23,7 @@
#include <CGAL/Deform_mesh.h>
#include <boost/function_output_iterator.hpp>
typedef Polyhedron::Vertex_handle Vertex_handle;
typedef boost::graph_traits<Polyhedron>::vertex_descriptor vertex_descriptor;
typedef boost::graph_traits<Polyhedron>::vertex_iterator vertex_iterator;