From 3929e6070d4509d7d0213b9ef1c77f2c9e1faaa7 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Tue, 19 Nov 2013 16:27:09 +0800 Subject: [PATCH] fix error form overrides a 'final' function --- cocos/2d/CCLayer.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index 2fab5e8745..40825a6d2d 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -87,16 +87,16 @@ public: CC_DEPRECATED_ATTRIBUTE virtual void ccTouchesCancelled(Set *pTouches, Event *pEvent) final {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);} // Deprecated touch callbacks.There not have add CC_DEPRECATED_ATTRIBUTE because of menu still use these api - virtual bool onTouchBegan(Touch *touch, Event *event) final {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event); return false;} - virtual void onTouchMoved(Touch *touch, Event *event) final {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event);} - virtual void onTouchEnded(Touch *touch, Event *event) final {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event);} - virtual void onTouchCancelled(Touch *touch, Event *event) final {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event);} + virtual bool onTouchBegan(Touch *touch, Event *event) {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event); return false;} + virtual void onTouchMoved(Touch *touch, Event *event) {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event);} + virtual void onTouchEnded(Touch *touch, Event *event) {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event);} + virtual void onTouchCancelled(Touch *touch, Event *event) {CC_UNUSED_PARAM(touch); CC_UNUSED_PARAM(event);} // Deprecated touch callbacks. - CC_DEPRECATED_ATTRIBUTE virtual void onTouchesBegan(const std::vector& touches, Event *event) final {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} - CC_DEPRECATED_ATTRIBUTE virtual void onTouchesMoved(const std::vector& touches, Event *event) final {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} - CC_DEPRECATED_ATTRIBUTE virtual void onTouchesEnded(const std::vector& touches, Event *event) final {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} - CC_DEPRECATED_ATTRIBUTE virtual void onTouchesCancelled(const std::vector&touches, Event *event) final {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} + CC_DEPRECATED_ATTRIBUTE virtual void onTouchesBegan(const std::vector& touches, Event *event) {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} + CC_DEPRECATED_ATTRIBUTE virtual void onTouchesMoved(const std::vector& touches, Event *event) {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} + CC_DEPRECATED_ATTRIBUTE virtual void onTouchesEnded(const std::vector& touches, Event *event) {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} + CC_DEPRECATED_ATTRIBUTE virtual void onTouchesCancelled(const std::vector&touches, Event *event) {CC_UNUSED_PARAM(touches); CC_UNUSED_PARAM(event);} /** @deprecated Please override onAcceleration */ CC_DEPRECATED_ATTRIBUTE virtual void didAccelerate(Acceleration* accelerationValue) final {};