diff --git a/cocos2dx/base_nodes/CCNode.cpp b/cocos2dx/base_nodes/CCNode.cpp index f7750540e0..d0b066cf8e 100644 --- a/cocos2dx/base_nodes/CCNode.cpp +++ b/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) diff --git a/cocos2dx/label_nodes/CCLabelBMFont.cpp b/cocos2dx/label_nodes/CCLabelBMFont.cpp index 6d7fd93436..c5a0a7684f 100644 --- a/cocos2dx/label_nodes/CCLabelBMFont.cpp +++ b/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(); diff --git a/cocos2dx/platform/mac/CCDirectorCaller.mm b/cocos2dx/platform/mac/CCDirectorCaller.mm index 46309ee5b0..424528612a 100755 --- a/cocos2dx/platform/mac/CCDirectorCaller.mm +++ b/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); } diff --git a/cocos2dx/platform/mac/CCEGLView.mm b/cocos2dx/platform/mac/CCEGLView.mm index b098e8a1f8..d709a3d5d8 100755 --- a/cocos2dx/platform/mac/CCEGLView.mm +++ b/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; } diff --git a/cocos2dx/shaders/CCGLProgram.cpp b/cocos2dx/shaders/CCGLProgram.cpp index 85c11e51fa..e0b48e4cad 100644 --- a/cocos2dx/shaders/CCGLProgram.cpp +++ b/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"); diff --git a/cocos2dx/shaders/CCShaderCache.cpp b/cocos2dx/shaders/CCShaderCache.cpp index 2a07de9a52..dcf155f77f 100644 --- a/cocos2dx/shaders/CCShaderCache.cpp +++ b/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(); } diff --git a/cocos2dx/sprite_nodes/CCAnimation.cpp b/cocos2dx/sprite_nodes/CCAnimation.cpp index 96076ea83b..46ed14050c 100644 --- a/cocos2dx/sprite_nodes/CCAnimation.cpp +++ b/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); diff --git a/cocos2dx/textures/CCTextureCache.cpp b/cocos2dx/textures/CCTextureCache.cpp index a70d6e47bc..589eba1e44 100644 --- a/cocos2dx/textures/CCTextureCache.cpp +++ b/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); diff --git a/cocos2dx/textures/CCTexturePVR.cpp b/cocos2dx/textures/CCTexturePVR.cpp index 73282426c8..c9ac84a89d 100644 --- a/cocos2dx/textures/CCTexturePVR.cpp +++ b/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) { diff --git a/cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.cpp b/cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.cpp index 806b7673a6..f4a68ae684 100644 --- a/cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.cpp +++ b/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); } diff --git a/cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.cpp b/cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.cpp index 09986b6783..f0f7df6b5a 100644 --- a/cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.cpp +++ b/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); diff --git a/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id index 8ae4f7c132..b673535ede 100644 --- a/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -98559cffb0522f553d9f6cf6a4d990b1b9fb2e83 \ No newline at end of file +8922f463911cface3b01435714d824c97adf5948 \ No newline at end of file