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

[Data Refactor] compilation error fix.

This commit is contained in:
James Chen 2013-12-20 21:16:46 +08:00
parent 21a9f05110
commit 9e05f300f3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCUserDefault.cpp
View File

@ -289,7 +289,7 @@ string UserDefault::getStringForKey(const char* pKey, const std::string & defaul
Data UserDefault::getDataForKey(const char* pKey) Data UserDefault::getDataForKey(const char* pKey)
{ {
return getDataForKey(pKey, NULL); return getDataForKey(pKey, Data::Null);
} }
Data UserDefault::getDataForKey(const char* pKey, const Data& defaultValue) Data UserDefault::getDataForKey(const char* pKey, const Data& defaultValue)

2
cocos/2d/CCUserDefault.mm
View File

@ -365,7 +365,7 @@ string UserDefault::getStringForKey(const char* pKey, const std::string & defaul
Data UserDefault::getDataForKey(const char* pKey) Data UserDefault::getDataForKey(const char* pKey)
{ {
return getDataForKey(pKey, NULL); return getDataForKey(pKey, Data::Null);
} }
Data UserDefault::getDataForKey(const char* pKey, const Data& defaultValue) Data UserDefault::getDataForKey(const char* pKey, const Data& defaultValue)

2
cocos/2d/platform/CCSAXParser.cpp
View File

@ -111,7 +111,7 @@ bool SAXParser::parse(const char* xmlData, size_t dataLength)
return tinyDoc.Accept( &printer ); return tinyDoc.Accept( &printer );
} }
bool SAXParser::parse(const char *pszFile) bool SAXParser::parse(const std::string& filename)
{ {
bool ret = false; bool ret = false;
Data data = FileUtils::getInstance()->getDataFromFile(filename); Data data = FileUtils::getInstance()->getDataFromFile(filename);

4
cocos/2d/platform/CCSAXParser.h
View File

@ -26,7 +26,7 @@
#include "CCPlatformConfig.h" #include "CCPlatformConfig.h"
#include "platform/CCCommon.h" #include "platform/CCCommon.h"
#include "string.h" // for size_t #include <string>
NS_CC_BEGIN NS_CC_BEGIN
@ -87,7 +87,7 @@ public:
* @js NA * @js NA
* @lua NA * @lua NA
*/ */
bool parse(const char *file); bool parse(const std::string& filename);
/** /**
* @js NA * @js NA
* @lua NA * @lua NA