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

issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance.

This commit is contained in:
James Chen 2013-07-22 17:19:31 +08:00
parent 2228614748
commit 0164946779
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/script_support/CCScriptSupport.cpp
View File

@ -136,7 +136,7 @@ void ScriptEngineManager::removeScriptEngine(void)
} }
} }
ScriptEngineManager* ScriptEngineManager::sharedManager(void) ScriptEngineManager* ScriptEngineManager::getInstance()
{ {
if (!s_pSharedScriptEngineManager) if (!s_pSharedScriptEngineManager)
{ {
@ -145,7 +145,7 @@ ScriptEngineManager* ScriptEngineManager::sharedManager(void)
return s_pSharedScriptEngineManager; return s_pSharedScriptEngineManager;
} }
void ScriptEngineManager::purgeSharedManager(void) void ScriptEngineManager::destroyInstance()
{ {
if (s_pSharedScriptEngineManager) if (s_pSharedScriptEngineManager)
{ {

7
cocos2dx/script_support/CCScriptSupport.h
View File

@ -350,8 +350,11 @@ public:
void setScriptEngine(ScriptEngineProtocol *pScriptEngine); void setScriptEngine(ScriptEngineProtocol *pScriptEngine);
void removeScriptEngine(void); void removeScriptEngine(void);
static ScriptEngineManager* sharedManager(void); static ScriptEngineManager* getInstance();
static void purgeSharedManager(void); static void destroyInstance();
CC_DEPRECATED_ATTRIBUTE static ScriptEngineManager* sharedManager() { return ScriptEngineManager::getInstance(); };
CC_DEPRECATED_ATTRIBUTE static void purgeSharedManager() { ScriptEngineManager::destroyInstance(); };
private: private:
ScriptEngineManager(void) ScriptEngineManager(void)