Merge branch 'master' into cxx17

This commit is contained in:
Stephen Seo 2021-09-08 10:46:39 +09:00
commit eca91d3670

View file

@ -20,7 +20,7 @@ TEST(ECThreadPool, CannotCompile) {
do { do {
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting()); } while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
ASSERT_EQ(data.load(), 1); ASSERT_EQ(data.load(), 1);
@ -31,7 +31,7 @@ TEST(ECThreadPool, CannotCompile) {
do { do {
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting()); } while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
ASSERT_EQ(data.load(), 11); ASSERT_EQ(data.load(), 11);
} }
@ -51,7 +51,7 @@ TEST(ECThreadPool, Simple) {
do { do {
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting()); } while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
ASSERT_EQ(data.load(), 1); ASSERT_EQ(data.load(), 1);
@ -62,7 +62,7 @@ TEST(ECThreadPool, Simple) {
do { do {
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
} while(!p.isQueueEmpty() && !p.isAllThreadsWaiting()); } while(!p.isQueueEmpty() || !p.isAllThreadsWaiting());
ASSERT_EQ(data.load(), 11); ASSERT_EQ(data.load(), 11);
} }