This fixes warnings when built with clang for i686, warning about casting between cdecl and stdcall - which normally can be fatal. This avoids needing to use casts when passing the function to WelsThreadCreate across all platforms.
Showing the changes to test/common/WelsThreadPoolTest.cpp (1 of 1 file). Show all
Unified · Split
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | uint32_t CSimpleTask::id = 0; |
| 16 | 16 | |
| 17 | −void* OneCallingFunc() { | |
| 17 | +WELS_THREAD_ROUTINE_TYPE OneCallingFunc(void *) { | |
| 18 | 18 | CThreadPoolTest cThreadPoolTest; |
| 19 | 19 | CSimpleTask* aTasks[TEST_TASK_NUM]; |
| 20 | 20 | CWelsThreadPool* pThreadPool = (CWelsThreadPool::AddReference()); |
| @@ -44,7 +44,7 @@ void* OneCallingFunc() { · 23 unmodified lines | ||
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | TEST (CThreadPoolTest, CThreadPoolTest) { |
| 47 | − OneCallingFunc(); | |
| 47 | + OneCallingFunc(NULL); | |
| 48 | 48 | |
| 49 | 49 | int iRet = CWelsThreadPool::SetThreadNum (8); |
| 50 | 50 | EXPECT_EQ (0, iRet); |
| @@ -81,12 +81,12 @@ TEST (CThreadPoolTest, CThreadPoolTestMulti) { · 30 unmodified lines | ||
| 81 | 81 | int i = 0; |
| 82 | 82 | WELS_THREAD_ERROR_CODE rc; |
| 83 | 83 | for (i = 0; i < iCallingNum; i++) { |
| 84 | − rc = WelsThreadCreate (& (mThreadID[i]), (LPWELS_THREAD_ROUTINE)OneCallingFunc, NULL, 0); | |
| 84 | + rc = WelsThreadCreate (& (mThreadID[i]), OneCallingFunc, NULL, 0); | |
| 85 | 85 | ASSERT_TRUE (rc == WELS_THREAD_ERROR_OK); |
| 86 | 86 | WelsSleep (1); |
| 87 | 87 | } |
| 88 | 88 | for (i = iCallingNum; i < iCallingNum * 2; i++) { |
| 89 | − rc = WelsThreadCreate (& (mThreadID[i]), (LPWELS_THREAD_ROUTINE)OneCallingFunc, NULL, 0); | |
| 89 | + rc = WelsThreadCreate (& (mThreadID[i]), OneCallingFunc, NULL, 0); | |
| 90 | 90 | ASSERT_TRUE (rc == WELS_THREAD_ERROR_OK); |
| 91 | 91 | WelsSleep (1); |
| 92 | 92 | WelsThreadJoin (mThreadID[i]); |
| @@ -95,7 +95,7 @@ TEST (CThreadPoolTest, CThreadPoolTestMulti) { · 2 unmodified lines | ||
| 95 | 95 | WelsThreadJoin (mThreadID[i]); |
| 96 | 96 | } |
| 97 | 97 | for (i = iCallingNum * 2; i < iCallingNum * 3; i++) { |
| 98 | − rc = WelsThreadCreate (& (mThreadID[i]), (LPWELS_THREAD_ROUTINE)OneCallingFunc, NULL, 0); | |
| 98 | + rc = WelsThreadCreate (& (mThreadID[i]), OneCallingFunc, NULL, 0); | |
| 99 | 99 | ASSERT_TRUE (rc == WELS_THREAD_ERROR_OK); |
| 100 | 100 | WelsSleep (1); |
| 101 | 101 | WelsThreadJoin (mThreadID[i]); |