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

fixed a bug that was causing x86_64 tests to crash while loading 

ccbuilder files
This commit is contained in:
billy1380 2013-04-12 14:37:28 +01:00
parent fc806d0496
commit 493d1d90ed
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/cocoa/CCDictionary.cpp
View File

@ -233,7 +233,7 @@ void CCDictionary::setObject(CCObject* pObject, const std::string& key)
}
}
void CCDictionary::setObject(CCObject* pObject, int key)
void CCDictionary::setObject(CCObject* pObject, long key)
{
CCAssert(pObject != NULL, "Invalid Argument!");
if (m_eDictType == kCCDictUnknown)
@ -294,7 +294,7 @@ void CCDictionary::setObjectUnSafe(CCObject* pObject, const std::string& key)
HASH_ADD_STR(m_pElements, m_szKey, pElement);
}
void CCDictionary::setObjectUnSafe(CCObject* pObject, const int key)
void CCDictionary::setObjectUnSafe(CCObject* pObject, const long key)
{
pObject->retain();
CCDictElement* pElement = new CCDictElement(key, pObject);

4
cocos2dx/cocoa/CCDictionary.h
View File

@ -275,7 +275,7 @@ public:
* @param key The string key for searching.
* @see setObject(CCObject*, const std::string&)
*/
void setObject(CCObject* pObject, int key);
void setObject(CCObject* pObject, long key);
/**
* Remove an object by the specified string key.
@ -380,7 +380,7 @@ private:
* For internal usage, invoked by setObject.
*/
void setObjectUnSafe(CCObject* pObject, const std::string& key);
void setObjectUnSafe(CCObject* pObject, const int key);
void setObjectUnSafe(CCObject* pObject, const long key);
public:
/**