From 2997c4fa6ac4a0bca80ecd2feb7615f88bbd1c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 2 Sep 2013 15:51:32 +0200 Subject: [PATCH] fixes for gcc --- Polyhedron/demo/Polyhedron/One_ring_iterators.h | 3 ++- Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Polyhedron/demo/Polyhedron/One_ring_iterators.h b/Polyhedron/demo/Polyhedron/One_ring_iterators.h index f81eb3681bf..9bad27fc8e9 100644 --- a/Polyhedron/demo/Polyhedron/One_ring_iterators.h +++ b/Polyhedron/demo/Polyhedron/One_ring_iterators.h @@ -29,7 +29,8 @@ struct One_ring_iterator { bool first; // to be used in One_ring_iterator operator Polyhedron::Halfedge_handle() const { - return &*circ < &*circ->opposite() ? circ : circ->opposite(); + if ( &*circ < &*circ->opposite() ) return circ; + return circ->opposite(); } }; diff --git a/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h index 64d09a10486..b227cb57471 100644 --- a/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -22,6 +23,7 @@ #include #include + typedef Polyhedron::Vertex_handle Vertex_handle; typedef boost::graph_traits::vertex_descriptor vertex_descriptor; typedef boost::graph_traits::vertex_iterator vertex_iterator;