diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp index 3a99d635bf1341605e1a1ea7a2f6f17874c1fa42..5288abf863809b748eda7756ad79a28e15348be7 100644 --- a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp @@ -425,8 +425,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentGetAndBlockInfullq AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); AssertEqual(ungetedOut, static_cast(0), "ungetedOut did not equal static_cast(0) as expected.", state); - for (auto& t : threads) { - t.join(); + for (auto& singleThread : threads) { + singleThread.join(); } while (!DemoThreadData::shareQueue.IsEmpty()) { demoDatas[0].Get(); @@ -633,11 +633,11 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentGetAndPopInfullque GetThreadDatePushedStatus(demoDatas, pushedIn, unpushedIn); AssertEqual(pushedIn, THREAD_NUM, "pushedIn did not equal THREAD_NUM as expected.", state); AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); - for (auto& t : threadsout) { - t.join(); + for (auto& outThread : threadsout) { + outThread.join(); } - for (auto& t : threadsin) { - t.join(); + for (auto& inThread : threadsin) { + inThread.join(); } while (!DemoThreadData::shareQueue.IsEmpty()) { demoDatas[0].Get(); diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp index 6184d9f692e8fc794b686c23ea134523fe2b2b8a..5b6ecad445d34c7be44c9b3222a15aa7df1daea1 100644 --- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp @@ -632,11 +632,11 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, testMutilthreadConcurrentGetAndPopI AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); AssertFalse((demoDatas[0].joinStatus), "step 2: demoDatas[0].joinStatus did not equal false.", state); demoDatas[0].joinStatus = false; - for (auto& t : threadsout) { - t.join(); + for (auto& outThread : threadsout) { + outThread.join(); } - for (auto& t : threadsin) { - t.join(); + for (auto& inThread : threadsin) { + inThread.join(); } processSharedQueueTasks(demoDatas[0]); joinThread.join();