github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Event explicit constructor removed

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9803 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-05-05 05:20:21 +00:00
parent b2ce197e2b
commit 44caa293ef
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/Core/Callback.h
View file

@ -90,12 +90,10 @@ public:
Event(const Event& src) : fn(src.fn) {}
Event& operator=(const Event& src) { fn = src.fn; return *this; }
Event(Fn&& src, int) : fn(src) {}
Event(Fn&& src, int) : fn(src) {} // Helper for callback compatibility code
template <class F>
Event(F src, int) : fn(src) {}
Event(F src, int) : fn(src) {} // Helper for callback compatibility code
explicit Event(Fn&& fn) : fn(pick(fn)) {}
Event(Event&& src) : fn(pick(src.fn)) {}
Event& operator=(Event&& src) { fn = pick(src.fn); return *this; }
@ -138,8 +136,6 @@ public:
EventGate(const EventGate& a) : fn(a.fn) {}
EventGate& operator=(const EventGate& a) { fn = a.fn; return *this; }
explicit EventGate(Fn&& fn) : fn(pick(fn)) {}
EventGate(Fn&& src, int) : fn(src) {}
EventGate& operator=(EventGate&& a) { fn = pick(a.fn); return *this; }