diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 327e33728c7..6884e43e59a 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -245,7 +245,7 @@ namespace CGAL { { dartmap[it]=mdarts.emplace(); init_dart(dartmap[it], amap.get_marks(it)); - internal::Copy_dart_info_functor::run + internal::Copy_dart_info_functor::run (amap, static_cast(*this), it, dartmap[it], dartinfoconverter); } @@ -289,7 +289,7 @@ namespace CGAL { CGAL::cpp11::tuple<> converters; Default_converter_dart_info dartinfoconverter; Default_converter_cmap_0attributes_with_point pointconverter; - return copy(amap, converters, dartinfoconverter, pointconverter ); + return copy(amap, converters, dartinfoconverter, pointconverter); } template @@ -3571,7 +3571,8 @@ namespace CGAL { { dual[it] = amap.create_dart(); internal::Copy_dart_info_functor:: - run(amap, static_cast(*this), it, dual[it]); + run(static_cast(amap), static_cast(*this), + it, dual[it]); if ( it==adart && res==amap.null_handle ) res = dual[it]; } diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h index d6584a2aa9e..fe329a32187 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -222,7 +222,7 @@ namespace CGAL { { dartmap[it]=mdarts.emplace(); init_dart(dartmap[it], amap.get_marks(it)); - internal::Copy_dart_info_functor:: + internal::Copy_dart_info_functor:: run(amap, static_cast(*this), it, dartmap[it], dartinfoconverter); } @@ -2744,7 +2744,8 @@ namespace CGAL { { dual[it] = amap.create_dart(); internal::Copy_dart_info_functor:: - run(amap, static_cast(*this), it, dual[it]); + run(static_cast(amap), static_cast(*this), + it, dual[it]); if ( it==adart && res==amap.null_handle ) res = dual[it]; } @@ -3936,7 +3937,6 @@ namespace CGAL { // The path must have at least one dart. if (afirst==alast) return false; Dart_const_handle prec = null_handle; - Dart_const_handle od = null_handle; for (InputIterator it(afirst); it!=alast; ++it) { @@ -3984,8 +3984,6 @@ namespace CGAL { bool withAlpha3 = false; - size_type treated = get_new_mark(); - { for (InputIterator it(afirst); !withAlpha3 && it!=alast; ++it) {