From fbd5a09cfd51f203840bf45f558de5153d01e940 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Thu, 4 Jun 2015 11:58:22 +0800 Subject: [PATCH 1/2] issue #10323: Fix the compile error when COCOS2D_DEBUG>=2. --- cocos/base/CCData.cpp | 1 + cocos/base/CCEventListener.cpp | 1 + cocos/base/CCEventListenerAcceleration.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/cocos/base/CCData.cpp b/cocos/base/CCData.cpp index db4f639e95..7c5a1e1bdf 100644 --- a/cocos/base/CCData.cpp +++ b/cocos/base/CCData.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "base/CCData.h" +#include "base/CCConsole.h" NS_CC_BEGIN diff --git a/cocos/base/CCEventListener.cpp b/cocos/base/CCEventListener.cpp index 0c7c32f598..562a129241 100644 --- a/cocos/base/CCEventListener.cpp +++ b/cocos/base/CCEventListener.cpp @@ -23,6 +23,7 @@ ****************************************************************************/ #include "base/CCEventListener.h" +#include "base/CCConsole.h" NS_CC_BEGIN diff --git a/cocos/base/CCEventListenerAcceleration.cpp b/cocos/base/CCEventListenerAcceleration.cpp index 2f15f46985..099919be97 100644 --- a/cocos/base/CCEventListenerAcceleration.cpp +++ b/cocos/base/CCEventListenerAcceleration.cpp @@ -24,6 +24,7 @@ #include "base/CCEventListenerAcceleration.h" #include "base/CCEventAcceleration.h" +#include "base/CCConsole.h" NS_CC_BEGIN From 825c89299a29ddf49e47f683970834e148de800f Mon Sep 17 00:00:00 2001 From: Bin Zhang Date: Thu, 4 Jun 2015 15:30:45 +0800 Subject: [PATCH 2/2] Update the reference of submodule cocos2d-console. --- tools/cocos2d-console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 3c9958a1d2..4f0fd0a30f 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 3c9958a1d2fc1ce1cea582c6bde0efc5a9537654 +Subproject commit 4f0fd0a30f010756e01a0e1b9c341873e981c10a