From 056e0d66fed067f49392aa4740bffd2fb6632c6f Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Fri, 1 Apr 2016 22:27:50 +0200 Subject: [PATCH] add a missing deprecated function; use non deprecated version in assert. --- .../include/CGAL/Combinatorial_map_operations.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h index 8b8910bce07..76c0ea0db5c 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h @@ -528,9 +528,11 @@ namespace CGAL * @param adart a dart of the i-cell. * @return true iff the i-cell can be contracted. */ +#ifndef CGAL_NO_DEPRECATED_CODE template < class CMap, unsigned int i > - bool is_contractible(const CMap& amap, typename CMap::Dart_const_handle adart) + CGAL_DEPRECATED bool is_contractible(const CMap& amap, typename CMap::Dart_const_handle adart) { return CGAL::Is_contractible_functor::run(amap,adart); } +#endif // CGAL_NO_DEPRECATED_CODE /** Contract an i-cell, 1(amap, adart)) ); + CGAL_assertion( (amap.is_contractible(adart)) ); size_t res = 0; @@ -701,7 +703,7 @@ namespace CGAL static size_t run(CMap& amap, typename CMap::Dart_handle adart, bool update_attributes) { - CGAL_assertion( (is_contractible(amap,adart)) ); + CGAL_assertion( (amap.is_contractible<1>(adart)) ); size_t res = 0;