From 44caa293ef2c65c8e59d4f1f68ffb42d6df28f93 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 5 May 2016 05:20:21 +0000 Subject: [PATCH] Core: Event explicit constructor removed git-svn-id: svn://ultimatepp.org/upp/trunk@9803 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Callback.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/uppsrc/Core/Callback.h b/uppsrc/Core/Callback.h index 4c805c000..ad34883d6 100644 --- a/uppsrc/Core/Callback.h +++ b/uppsrc/Core/Callback.h @@ -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 - 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; }