From a54b648050c33293766bcb3448efe42d3b45bb56 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 9 May 2016 10:46:43 +0200 Subject: [PATCH] Fix for heap out of space --- .../boost/graph/properties_Surface_mesh.h | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h b/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h index e05ab5d5fc3..1da0fc360e3 100644 --- a/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h +++ b/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h @@ -259,19 +259,22 @@ namespace internal { // get for intrinsic properties #define CGAL_SM_INTRINSIC_PROPERTY(RET, PROP, TYPE) \ - template \ - RET \ - get(PROP p, const CGAL::Surface_mesh& sm, \ - typename boost::lazy_disable_if< \ - boost::is_const, internal::Get_graph_traits_of_SM \ - >::type::TYPE x) \ - { return get(get(p, sm), x); } \ + template \ + RET \ + get(PROP p, const CGAL::Surface_mesh& sm, \ + const TYPE& x) \ + { return get(get(p, sm), x); } \ -CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::vertex_index_t, vertex_descriptor) -CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::edge_index_t, edge_descriptor) -CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::halfedge_index_t, halfedge_descriptor) -CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::face_index_t, face_descriptor) -CGAL_SM_INTRINSIC_PROPERTY(Point&, CGAL::vertex_point_t, vertex_descriptor) + +CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::vertex_index_t, +SM_Vertex_index) +CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::edge_index_t, +SM_Edge_index) +CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::halfedge_index_t, +SM_Halfedge_index) +CGAL_SM_INTRINSIC_PROPERTY(boost::uint32_t, boost::face_index_t, +SM_Face_index) +CGAL_SM_INTRINSIC_PROPERTY(Point&, CGAL::vertex_point_t, SM_Vertex_index) #undef CGAL_SM_INTRINSIC_PROPERTY