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

Add missing template argument when calling Copy_dart_info_functor; plus a cast for dual in order to get the correct type.

This commit is contained in:
Guillaume Damiand 2016-11-01 08:56:01 -04:00
parent 04e6e0f73b
commit 98cba35a39
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -245,7 +245,7 @@ namespace CGAL {
{ {
dartmap[it]=mdarts.emplace(); dartmap[it]=mdarts.emplace();
init_dart(dartmap[it], amap.get_marks(it)); init_dart(dartmap[it], amap.get_marks(it));
internal::Copy_dart_info_functor<CMap2, Refs>::run internal::Copy_dart_info_functor<CMap2, Refs, DartInfoConverter>::run
(amap, static_cast<Refs&>(*this), it, dartmap[it], (amap, static_cast<Refs&>(*this), it, dartmap[it],
dartinfoconverter); dartinfoconverter);
} }
@ -289,7 +289,7 @@ namespace CGAL {
CGAL::cpp11::tuple<> converters; CGAL::cpp11::tuple<> converters;
Default_converter_dart_info<CMap2, Refs> dartinfoconverter; Default_converter_dart_info<CMap2, Refs> dartinfoconverter;
Default_converter_cmap_0attributes_with_point<CMap2, Refs> pointconverter; Default_converter_cmap_0attributes_with_point<CMap2, Refs> pointconverter;
return copy(amap, converters, dartinfoconverter, pointconverter ); return copy(amap, converters, dartinfoconverter, pointconverter);
} }
template <typename CMap2, typename Converters> template <typename CMap2, typename Converters>
@ -3571,7 +3571,8 @@ namespace CGAL {
{ {
dual[it] = amap.create_dart(); dual[it] = amap.create_dart();
internal::Copy_dart_info_functor<Refs, Refs>:: internal::Copy_dart_info_functor<Refs, Refs>::
run(amap, static_cast<Refs&>(*this), it, dual[it]); run(static_cast<Refs&>(amap), static_cast<Refs&>(*this),
it, dual[it]);
if ( it==adart && res==amap.null_handle ) res = dual[it]; if ( it==adart && res==amap.null_handle ) res = dual[it];
} }

8
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -222,7 +222,7 @@ namespace CGAL {
{ {
dartmap[it]=mdarts.emplace(); dartmap[it]=mdarts.emplace();
init_dart(dartmap[it], amap.get_marks(it)); init_dart(dartmap[it], amap.get_marks(it));
internal::Copy_dart_info_functor<GMap2, Refs>:: internal::Copy_dart_info_functor<GMap2, Refs, DartInfoConverter>::
run(amap, static_cast<Refs&>(*this), it, dartmap[it], run(amap, static_cast<Refs&>(*this), it, dartmap[it],
dartinfoconverter); dartinfoconverter);
} }
@ -2744,7 +2744,8 @@ namespace CGAL {
{ {
dual[it] = amap.create_dart(); dual[it] = amap.create_dart();
internal::Copy_dart_info_functor<Refs, Refs>:: internal::Copy_dart_info_functor<Refs, Refs>::
run(amap, static_cast<Refs&>(*this), it, dual[it]); run(static_cast<Refs&>(amap), static_cast<Refs&>(*this),
it, dual[it]);
if ( it==adart && res==amap.null_handle ) res = 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. // The path must have at least one dart.
if (afirst==alast) return false; if (afirst==alast) return false;
Dart_const_handle prec = null_handle; Dart_const_handle prec = null_handle;
Dart_const_handle od = null_handle;
for (InputIterator it(afirst); it!=alast; ++it) for (InputIterator it(afirst); it!=alast; ++it)
{ {
@ -3984,8 +3984,6 @@ namespace CGAL {
bool withAlpha3 = false; bool withAlpha3 = false;
size_type treated = get_new_mark();
{ {
for (InputIterator it(afirst); !withAlpha3 && it!=alast; ++it) for (InputIterator it(afirst); !withAlpha3 && it!=alast; ++it)
{ {