From 663673b68337c2f1eca69780082295fbfd226c7c Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 19 Jun 2013 16:11:16 +0800 Subject: [PATCH 1/3] Adding missing include in ZipUtils.h. --- cocos2dx/support/zip_support/ZipUtils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos2dx/support/zip_support/ZipUtils.h b/cocos2dx/support/zip_support/ZipUtils.h index 60408390d6..f6f9e539aa 100644 --- a/cocos2dx/support/zip_support/ZipUtils.h +++ b/cocos2dx/support/zip_support/ZipUtils.h @@ -25,6 +25,7 @@ THE SOFTWARE. #define __SUPPORT_ZIPUTILS_H__ #include +#include "platform/CCPlatformConfig.h" #include "CCPlatformDefine.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) From 6ce5064f322a9874876112aec55ea002c5c641e5 Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 20 Jun 2013 18:01:53 +0800 Subject: [PATCH 2/3] [WIN32] NULL --> nullptr for CCLayer.cpp. --- cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp index bf2e3be0f7..ae5d984085 100644 --- a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp +++ b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp @@ -402,7 +402,7 @@ void Layer::onExit() // remove this layer from the delegates who concern Accelerometer Sensor if (_accelerometerEnabled) { - pDirector->getAccelerometer()->setDelegate(NULL); + pDirector->getAccelerometer()->setDelegate(nullptr); } // remove this layer from the delegates who concern the keypad msg From 8b2b95ab4dd4b00ec35e94e998fc6802b4b7f2e0 Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 20 Jun 2013 18:02:37 +0800 Subject: [PATCH 3/3] [WIN32] class Action : public Object, public Clonable --> class Action : public Clonable, public Object --- cocos2dx/actions/CCAction.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2dx/actions/CCAction.h b/cocos2dx/actions/CCAction.h index 4279d772d9..5084376d68 100644 --- a/cocos2dx/actions/CCAction.h +++ b/cocos2dx/actions/CCAction.h @@ -46,7 +46,7 @@ enum { /** @brief Base class for Action objects. */ -class CC_DLL Action : public Object, public Clonable +class CC_DLL Action : public Clonable, public Object { public: Action(void);