Adds CCThreadPool.cpp/.h to vs project.

This commit is contained in:
James Chen
2017-09-26 14:30:53 +08:00
parent 7ffb0d40db
commit 5c5a0a257a
4 changed files with 12 additions and 10 deletions
+2
View File
@@ -233,6 +233,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)"
<ClCompile Include="..\base\CCRef.cpp" />
<ClCompile Include="..\base\CCScheduler.cpp" />
<ClCompile Include="..\base\CCScriptSupport.cpp" />
<ClCompile Include="..\base\CCThreadPool.cpp" />
<ClCompile Include="..\base\CCTouch.cpp" />
<ClCompile Include="..\base\ccTypes.cpp" />
<ClCompile Include="..\base\CCUserDefault.cpp" />
@@ -481,6 +482,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32\libs\*.*" "$(OutDir)"
<ClInclude Include="..\base\CCRefPtr.h" />
<ClInclude Include="..\base\CCScheduler.h" />
<ClInclude Include="..\base\CCScriptSupport.h" />
<ClInclude Include="..\base\CCThreadPool.h" />
<ClInclude Include="..\base\CCTouch.h" />
<ClInclude Include="..\base\ccTypes.h" />
<ClInclude Include="..\base\CCUserDefault.h" />
+6 -5
View File
@@ -689,9 +689,6 @@
<ClCompile Include="..\base\CCStencilStateManager.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIPageViewIndicator.cpp">
<Filter>ui\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\creator\CCScale9Sprite.cpp">
<Filter>creator</Filter>
</ClCompile>
@@ -786,6 +783,9 @@
<ClCompile Include="..\network\WebSocket-libwebsockets.cpp">
<Filter>network\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\base\CCThreadPool.cpp">
<Filter>base</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\cocos2d.h" />
@@ -1480,8 +1480,6 @@
<ClInclude Include="..\..\external\sources\poly2tri\sweep\cdt.h" />
<ClInclude Include="..\..\external\sources\poly2tri\sweep\sweep.h" />
<ClInclude Include="..\..\external\sources\poly2tri\sweep\sweep_context.h" />
<ClInclude Include="..\ui\UIAbstractCheckButton.h" />
<ClInclude Include="..\ui\UITabControl.h" />
<ClInclude Include="..\editor-support\creator\CCCameraNode.h">
<Filter>creator</Filter>
</ClInclude>
@@ -1545,6 +1543,9 @@
<ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl-common.h">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClInclude>
<ClInclude Include="..\base\CCThreadPool.h">
<Filter>base</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\Mat4.inl">
+2 -3
View File
@@ -26,7 +26,6 @@
****************************************************************************/
#include "base/CCThreadPool.h"
#include <sys/time.h>
#ifdef __ANDROID__
@@ -165,7 +164,7 @@ bool ThreadPool::tryShrinkPool()
for (int i = 0; i < _maxThreadNum; ++i)
{
if (threadIDsToJoin.size() >= maxThreadNumToJoin)
if ((int)threadIDsToJoin.size() >= maxThreadNumToJoin)
{
break;
}
@@ -330,7 +329,7 @@ void ThreadPool::stopTasksByType(TaskType type)
void ThreadPool::joinThread(int tid)
{
if (tid < 0 || tid >= _threads.size())
if (tid < 0 || tid >= (int)_threads.size())
{
LOGD("Invalid thread id %d\n", tid);
return;
+2 -2
View File
@@ -26,7 +26,7 @@
****************************************************************************/
#pragma once
//#include "platform/CCPlatformMacros.h"
#include "platform/CCStdC.h"
#include <functional>
#include <memory>
@@ -44,7 +44,7 @@ namespace cocos2d { namespace experimental {
* @{
*/
class ThreadPool
class CC_DLL ThreadPool
{
public: