Sync with cocos2d-x v3 branch ddb4dc8 commit.

This commit is contained in:
James Chen
2017-04-24 10:49:02 +08:00
parent 91cfd45ee9
commit fc98b4bdc0
115 changed files with 5389 additions and 2620 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2016-2017 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -102,7 +102,7 @@ ThreadPool *ThreadPool::newSingleThreadPool()
}
ThreadPool::ThreadPool(int minNum, int maxNum)
: _isStop(false), _isDone(false), _idleThreadNum(0), _minThreadNum(minNum),
: _isDone(false), _isStop(false), _idleThreadNum(0), _minThreadNum(minNum),
_maxThreadNum(maxNum), _initedThreadNum(0), _shrinkInterval(DEFAULT_SHRINK_INTERVAL),
_shrinkStep(DEFAULT_SHRINK_STEP), _stretchStep(DEFAULT_STRETCH_STEP),
_isFixedSize(false)