Fix typo of function name in AsyncTaskPool

LovelinMangang · Feb 25, 2016 · 5de611b · 5de611b
1 parent c7ced7d
commit 5de611b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/cocos/base/CCAsyncTaskPool.cpp b/cocos/base/CCAsyncTaskPool.cpp
@@ -38,7 +38,7 @@ AsyncTaskPool* AsyncTaskPool::getInstance()
     return s_asyncTaskPool;
 }
 
-void AsyncTaskPool::destoryInstance()
+void AsyncTaskPool::destroyInstance()
 {
     delete s_asyncTaskPool;
     s_asyncTaskPool = nullptr;

diff --git a/cocos/base/CCAsyncTaskPool.h b/cocos/base/CCAsyncTaskPool.h
@@ -71,7 +71,10 @@ class CC_DLL AsyncTaskPool
     /**
      * Destroys the async task pool.
      */
-    static void destoryInstance();
+    static void destroyInstance();
+
+    /** @deprecated Use method destroyInstance() instead. */
+    CC_DEPRECATED_ATTRIBUTE static void destoryInstance() { return destroyInstance(); }
 
     /**
      * Stop tasks.

diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp
@@ -1037,7 +1037,7 @@ void Director::reset()
     GLProgramCache::destroyInstance();
     GLProgramStateCache::destroyInstance();
     FileUtils::destroyInstance();
-    AsyncTaskPool::destoryInstance();
+    AsyncTaskPool::destroyInstance();
 
     // cocos2d-x specific data structures
     UserDefault::destroyInstance();