Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop_nutty_modify_framework_fixedmemleak

This commit is contained in:
CaiWenzhi 2014-01-06 15:57:19 +08:00
parent ee9634c8d2 d9e79b4ec5
commit 81836d8aeb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/CCSSceneReader.cpp
View File

@ -146,7 +146,7 @@ Node* SceneReader::createObject(const rapidjson::Value &dict, cocos2d::Node* par
} }
else else
{ {
CC_SAFE_RELEASE(com); CC_SAFE_RELEASE_NULL(com);
} }
} }
if(_fnSelector != nullptr) if(_fnSelector != nullptr)

2
samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.cpp
View File

@ -343,7 +343,9 @@ void TemplateMapTest::onEnter()
Map<std::string, Node*> map1; Map<std::string, Node*> map1;
CCASSERT(map1.empty(), ""); CCASSERT(map1.empty(), "");
CCASSERT(map1.size() == 0, ""); CCASSERT(map1.size() == 0, "");
#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32)
CCASSERT(map1.bucketCount() == 0, ""); CCASSERT(map1.bucketCount() == 0, "");
#endif
CCASSERT(map1.keys().empty(), ""); CCASSERT(map1.keys().empty(), "");
CCASSERT(map1.keys(Node::create()).empty(), ""); CCASSERT(map1.keys(Node::create()).empty(), "");