From d332c171c15ccf6b671adb98505b2ae7e8973dff Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 4 May 2016 16:50:31 +0000 Subject: [PATCH] Core: Event overloading refactored git-svn-id: svn://ultimatepp.org/upp/trunk@9798 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Callback.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/uppsrc/Core/Callback.h b/uppsrc/Core/Callback.h index f21055e10..fbce61f09 100644 --- a/uppsrc/Core/Callback.h +++ b/uppsrc/Core/Callback.h @@ -93,19 +93,11 @@ public: Event(Fn&& src, int) : fn(src) {} template Event(F src, int) : fn(src) {} -// Event(Fn&& src) : fn(src) {} -// Event& operator=(const Fn& src) { fn = src.fn; return *this; } Event& operator=(const Event& src) { fn = src.fn; return *this; } Event& operator=(Event&& src) { fn = pick(src.fn); return *this; } Event& operator=(CNULLer) { fn.Clear(); return *this; } Event Proxy() const { return Event(fn.Proxy(), 1); } -/* - Event& operator<<(const Event& b) { fn << b.fn; return *this; } - Event& operator<<(const Fn& b) { fn << b; return *this; } - Event& operator<<(Event&& b) { fn << pick(b.fn); return *this; } - Event& operator<<(Fn&& b) { fn << pick(b); return *this; } -*/ template Event& operator<<(const F& f) { fn << f; return *this; }