Merge branch 'master' into cxx17
This commit is contained in:
commit
eca91d3670
1 changed files with 4 additions and 4 deletions
|
@ -20,7 +20,7 @@ TEST(ECThreadPool, CannotCompile) {
|
|||
|
||||
do {
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting());
|
||||
} while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
|
||||
|
||||
ASSERT_EQ(data.load(), 1);
|
||||
|
||||
|
@ -31,7 +31,7 @@ TEST(ECThreadPool, CannotCompile) {
|
|||
|
||||
do {
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting());
|
||||
} while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
|
||||
|
||||
ASSERT_EQ(data.load(), 11);
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ TEST(ECThreadPool, Simple) {
|
|||
|
||||
do {
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting());
|
||||
} while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
|
||||
|
||||
ASSERT_EQ(data.load(), 1);
|
||||
|
||||
|
@ -62,7 +62,7 @@ TEST(ECThreadPool, Simple) {
|
|||
|
||||
do {
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting());
|
||||
} while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
|
||||
|
||||
ASSERT_EQ(data.load(), 11);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue