From 3401c909d8bb09b38b4542dc979ea4a3600eb7d5 Mon Sep 17 00:00:00 2001 From: Xuejie Xiao Date: Thu, 4 Jul 2013 13:35:11 +0800 Subject: [PATCH] Add namespace prefix to selector macros --- cocos2dx/cocoa/CCObject.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cocos2dx/cocoa/CCObject.h b/cocos2dx/cocoa/CCObject.h index c28947e9b7..0dc1d3d52a 100644 --- a/cocos2dx/cocoa/CCObject.h +++ b/cocos2dx/cocoa/CCObject.h @@ -100,14 +100,14 @@ typedef void (Object::*SEL_MenuHandler)(Object*); typedef void (Object::*SEL_EventHandler)(Event*); typedef int (Object::*SEL_Compare)(Object*); -#define schedule_selector(_SELECTOR) (SEL_SCHEDULE)(&_SELECTOR) -#define callfunc_selector(_SELECTOR) (SEL_CallFunc)(&_SELECTOR) -#define callfuncN_selector(_SELECTOR) (SEL_CallFuncN)(&_SELECTOR) -#define callfuncND_selector(_SELECTOR) (SEL_CallFuncND)(&_SELECTOR) -#define callfuncO_selector(_SELECTOR) (SEL_CallFuncO)(&_SELECTOR) -#define menu_selector(_SELECTOR) (SEL_MenuHandler)(&_SELECTOR) -#define event_selector(_SELECTOR) (SEL_EventHandler)(&_SELECTOR) -#define compare_selector(_SELECTOR) (SEL_Compare)(&_SELECTOR) +#define schedule_selector(_SELECTOR) (cocos2d::SEL_SCHEDULE)(&_SELECTOR) +#define callfunc_selector(_SELECTOR) (cocos2d::SEL_CallFunc)(&_SELECTOR) +#define callfuncN_selector(_SELECTOR) (cocos2d::SEL_CallFuncN)(&_SELECTOR) +#define callfuncND_selector(_SELECTOR) (cocos2d::SEL_CallFuncND)(&_SELECTOR) +#define callfuncO_selector(_SELECTOR) (cocos2d::SEL_CallFuncO)(&_SELECTOR) +#define menu_selector(_SELECTOR) (cocos2d::SEL_MenuHandler)(&_SELECTOR) +#define event_selector(_SELECTOR) (cocos2d::SEL_EventHandler)(&_SELECTOR) +#define compare_selector(_SELECTOR) (cocos2d::SEL_Compare)(&_SELECTOR) // new callbacks based on C++11 #define CC_CALLBACK_0(__selector__,__target__, ...) std::bind(&__selector__,__target__, ##__VA_ARGS__)