Merge pull request #2778 from ricardoquesada/dealloc_log_fixed

on dealloc, log "this" with %p, not %x.

cocos2dx/base_nodes/CCNode.cpp

@@ -103,7 +103,7 @@ CCNode::CCNode(void)
 
 CCNode::~CCNode(void)
 {
-    CCLOGINFO( "cocos2d: deallocing" );
+    CCLOGINFO( "cocos2d: deallocing: %p", this );
     
     unregisterScriptHandler();
     if (m_nUpdateScriptHandler)

cocos2dx/label_nodes/CCLabelBMFont.cpp

@@ -142,7 +142,7 @@ CCBMFontConfiguration::CCBMFontConfiguration()
 
 CCBMFontConfiguration::~CCBMFontConfiguration()
 {
-    CCLOGINFO( "cocos2d: deallocing CCBMFontConfiguration" );
+    CCLOGINFO( "cocos2d: deallocing CCBMFontConfiguration %p", this );
     this->purgeFontDefDictionary();
     this->purgeKerningDictionary();
     m_sAtlasName.clear();

cocos2dx/platform/mac/CCDirectorCaller.mm

@@ -59,7 +59,7 @@ static id s_sharedDirectorCaller;
 -(void) dealloc
 {
     s_sharedDirectorCaller = nil;
-    CCLOG("cocos2d: deallocing CCDirectorCaller %x", self);
+    CCLOG("cocos2d: deallocing CCDirectorCaller %p", self);
 	if (displayLink) {
 		CVDisplayLinkRelease(displayLink);
 	}

cocos2dx/platform/mac/CCEGLView.mm

@@ -47,7 +47,7 @@ CCEGLView::CCEGLView(void)
 
 CCEGLView::~CCEGLView(void)
 {
-    CCLOG("cocos2d: deallocing CCEGLView %0x", this);
+    CCLOG("cocos2d: deallocing CCEGLView %p", this);
     s_sharedView = NULL;
 }
 

cocos2dx/shaders/CCGLProgram.cpp

@@ -57,7 +57,7 @@ CCGLProgram::CCGLProgram()
 
 CCGLProgram::~CCGLProgram()
 {
-    CCLOGINFO("cocos2d: %s %d deallocing 0x%X", __FUNCTION__, __LINE__, this);
+    CCLOGINFO("cocos2d: %s %d deallocing %p", __FUNCTION__, __LINE__, this);
 
     // there is no need to delete the shaders. They should have been already deleted.
     CCAssert(m_uVertShader == 0, "Vertex Shaders should have been already deleted");

cocos2dx/shaders/CCShaderCache.cpp

@@ -71,7 +71,7 @@ CCShaderCache::CCShaderCache()
 
 CCShaderCache::~CCShaderCache()
 {
-    CCLOGINFO("cocos2d deallocing 0x%X", this);
+    CCLOGINFO("cocos2d deallocing %p", this);
     m_pPrograms->release();
 }
 

cocos2dx/sprite_nodes/CCAnimation.cpp

@@ -51,7 +51,7 @@ bool CCAnimationFrame::initWithSpriteFrame(CCSpriteFrame* spriteFrame, float del
 
 CCAnimationFrame::~CCAnimationFrame()
 {    
-    CCLOGINFO( "cocos2d: deallocing %s", this);
+    CCLOGINFO( "cocos2d: deallocing %p", this);
 
     CC_SAFE_RELEASE(m_pSpriteFrame);
     CC_SAFE_RELEASE(m_pUserInfo);

cocos2dx/textures/CCTextureCache.cpp

@@ -207,7 +207,7 @@ CCTextureCache::CCTextureCache()
 
 CCTextureCache::~CCTextureCache()
 {
-    CCLOGINFO("cocos2d: deallocing CCTextureCache.");
+    CCLOGINFO("cocos2d: deallocing CCTextureCache: %p", this);
     need_quit = true;
 
     pthread_cond_signal(&s_SleepCondition);

cocos2dx/textures/CCTexturePVR.cpp

@@ -242,7 +242,7 @@ CCTexturePVR::CCTexturePVR()
 
 CCTexturePVR::~CCTexturePVR()
 {
-    CCLOGINFO( "cocos2d: deallocing CCTexturePVR" );
+    CCLOGINFO( "cocos2d: deallocing CCTexturePVR: %p", this );
 
     if (m_uName != 0 && ! m_bRetainName)
     {

cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.cpp

@@ -41,7 +41,7 @@ CCTMXObjectGroup::CCTMXObjectGroup()
 }
 CCTMXObjectGroup::~CCTMXObjectGroup()
 {
-    CCLOGINFO( "cocos2d: deallocing.");
+    CCLOGINFO( "cocos2d: deallocing: %p", this);
     CC_SAFE_RELEASE(m_pObjects);
     CC_SAFE_RELEASE(m_pProperties);
 }

cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.cpp

@@ -78,7 +78,7 @@ CCTMXLayerInfo::CCTMXLayerInfo()
 
 CCTMXLayerInfo::~CCTMXLayerInfo()
 {
-    CCLOGINFO("cocos2d: deallocing.");
+    CCLOGINFO("cocos2d: deallocing: %p", this);
     CC_SAFE_RELEASE(m_pProperties);
     if( m_bOwnTiles && m_pTiles )
     {
@@ -108,7 +108,7 @@ CCTMXTilesetInfo::CCTMXTilesetInfo()
 }
 CCTMXTilesetInfo::~CCTMXTilesetInfo()
 {
-    CCLOGINFO("cocos2d: deallocing.");
+    CCLOGINFO("cocos2d: deallocing: %p", this);
 }
 CCRect CCTMXTilesetInfo::rectForGID(unsigned int gid)
 {
@@ -208,7 +208,7 @@ CCTMXMapInfo::CCTMXMapInfo()
 
 CCTMXMapInfo::~CCTMXMapInfo()
 {
-    CCLOGINFO("cocos2d: deallocing.");
+    CCLOGINFO("cocos2d: deallocing: %p", this);
     CC_SAFE_RELEASE(m_pTilesets);
     CC_SAFE_RELEASE(m_pLayers);
     CC_SAFE_RELEASE(m_pProperties);

samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-98559cffb0522f553d9f6cf6a4d990b1b9fb2e83
+8922f463911cface3b01435714d824c97adf5948