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

Use named constructor to resolve ambiguity

This commit is contained in:
Simon Giraudot 2020-08-04 13:06:08 +02:00
parent 2d1afb8895
commit 739a8b66e8
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
STL_Extension/include/CGAL/Compact_container.h
View File

@ -910,12 +910,11 @@ namespace internal {
m_ptr = nullptr; m_ptr = nullptr;
} }
CC_iterator (pointer p) static CC_iterator create_from_pointer (pointer p)
#ifdef CGAL_COMPACT_CONTAINER_DEBUG_TIME_STAMP
: ts(0)
#endif
{ {
m_ptr.p = p; CC_iterator out;
out.m_ptr.p = p;
return out;
} }
private: private:

2
STL_Extension/include/CGAL/Multiset.h
View File

@ -282,7 +282,7 @@ protected:
void deallocate (Node* n) void deallocate (Node* n)
{ {
base.erase (typename Base::iterator(n)); base.erase (Base::iterator::create_from_pointer(n));
} }
}; };

2
Surface_sweep_2/include/CGAL/Surface_sweep_2/No_intersection_surface_sweep_2_impl.h
View File

@ -116,7 +116,7 @@ template <typename Vis>
void No_intersection_surface_sweep_2<Vis>::deallocate_event(Event* event) void No_intersection_surface_sweep_2<Vis>::deallocate_event(Event* event)
{ {
// Remove the event from the set of allocated events. // Remove the event from the set of allocated events.
m_allocated_events.erase(Allocated_events_iterator(event)); m_allocated_events.erase(Allocated_events_iterator::create_from_pointer(event));
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------