boostorg/fiber
1
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-07-21 13:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings in unit-tests

Browse Source
This commit is contained in:
Oliver Kowalke
2017-05-30 19:22:48 +02:00
parent 953bcb423e
commit d2152b0403
16 changed files with 97 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test_buffered_channel_dispatch.cpp
+1 -1
View File
@@ -428,7 +428,7 @@ void test_wm_2() {
boost::fibers::fiber::id id2 = f2.get_id();
f1.join();
f2.join();
BOOST_CHECK_EQUAL( 12, ids.size() );
BOOST_CHECK_EQUAL( (std::size_t)12, ids.size() );
BOOST_CHECK_EQUAL( id1, ids[0]);
BOOST_CHECK_EQUAL( id1, ids[1]);
BOOST_CHECK_EQUAL( id1, ids[2]);
test/test_buffered_channel_post.cpp
+2 -2
View File
@@ -362,7 +362,7 @@ void test_wm_1() {
boost::fibers::fiber::id id2 = f2.get_id();
f1.join();
f2.join();
BOOST_CHECK_EQUAL( 12, ids.size() );
BOOST_CHECK_EQUAL( (std::size_t)12, ids.size() );
BOOST_CHECK_EQUAL( id1, ids[0]);
BOOST_CHECK_EQUAL( id1, ids[1]);
BOOST_CHECK_EQUAL( id1, ids[2]);
@@ -426,7 +426,7 @@ void test_wm_2() {
boost::fibers::fiber::id id2 = f2.get_id();
f1.join();
f2.join();
BOOST_CHECK_EQUAL( 12, ids.size() );
BOOST_CHECK_EQUAL( (std::size_t)12, ids.size() );
BOOST_CHECK_EQUAL( id1, ids[0]);
BOOST_CHECK_EQUAL( id1, ids[1]);
BOOST_CHECK_EQUAL( id1, ids[2]);
test/test_condition_variable_any_dispatch.cpp
+20 -20
View File
@@ -21,10 +21,10 @@
typedef std::chrono::nanoseconds ns;
typedef std::chrono::milliseconds ms;
int value = 0;
int value1 = 0;
inline
std::chrono::system_clock::time_point delay(int secs, int msecs=0, int nsecs=0) {
std::chrono::system_clock::time_point delay(int secs, int msecs = 0, int /*nsecs*/ = 0) {
std::chrono::system_clock::time_point t = std::chrono::system_clock::now();
t += std::chrono::seconds( secs);
t += std::chrono::milliseconds( msecs);
@@ -78,12 +78,12 @@ void wait_fn(
boost::fibers::condition_variable_any & cond) {
mtx.lock();
cond.wait( mtx);
++value;
++value1;
mtx.unlock();
}
void test_one_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable_any cond;
@@ -92,23 +92,23 @@ void test_one_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::dispatch,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
BOOST_CHECK_EQUAL( 1, value);
BOOST_CHECK_EQUAL( 1, value1);
}
void test_two_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable_any cond;
@@ -117,37 +117,37 @@ void test_two_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::dispatch,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::dispatch,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::dispatch,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 1, value);
BOOST_CHECK_EQUAL( 1, value1);
f1.join();
f2.join();
f3.join();
f4.join();
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
}
void test_two_waiter_notify_all() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable_any cond;
@@ -156,33 +156,33 @@ void test_two_waiter_notify_all() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::dispatch,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::dispatch,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::dispatch,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
boost::fibers::fiber f5(
boost::fibers::launch::dispatch,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
f1.join();
f2.join();
@@ -190,7 +190,7 @@ void test_two_waiter_notify_all() {
f4.join();
f5.join();
BOOST_CHECK_EQUAL( 3, value);
BOOST_CHECK_EQUAL( 3, value1);
}
int test1 = 0;
test/test_condition_variable_any_post.cpp
+20 -20
View File
@@ -21,10 +21,10 @@
typedef std::chrono::nanoseconds ns;
typedef std::chrono::milliseconds ms;
int value = 0;
int value1 = 0;
inline
std::chrono::system_clock::time_point delay(int secs, int msecs=0, int nsecs=0) {
std::chrono::system_clock::time_point delay(int secs, int msecs=0, int /*nsecs*/=0) {
std::chrono::system_clock::time_point t = std::chrono::system_clock::now();
t += std::chrono::seconds( secs);
t += std::chrono::milliseconds( msecs);
@@ -78,12 +78,12 @@ void wait_fn(
boost::fibers::condition_variable_any & cond) {
mtx.lock();
cond.wait( mtx);
++value;
++value1;
mtx.unlock();
}
void test_one_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable_any cond;
@@ -92,23 +92,23 @@ void test_one_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::post,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
BOOST_CHECK_EQUAL( 1, value);
BOOST_CHECK_EQUAL( 1, value1);
}
void test_two_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable_any cond;
@@ -117,37 +117,37 @@ void test_two_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::post,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::post,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::post,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
f3.join();
f4.join();
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
}
void test_two_waiter_notify_all() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable_any cond;
@@ -156,33 +156,33 @@ void test_two_waiter_notify_all() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::post,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::post,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::post,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f5(
boost::fibers::launch::post,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
@@ -190,7 +190,7 @@ void test_two_waiter_notify_all() {
f4.join();
f5.join();
BOOST_CHECK_EQUAL( 3, value);
BOOST_CHECK_EQUAL( 3, value1);
}
int test1 = 0;
test/test_condition_variable_dispatch.cpp
+20 -20
View File
@@ -22,10 +22,10 @@
typedef std::chrono::nanoseconds ns;
typedef std::chrono::milliseconds ms;
int value = 0;
int value1 = 0;
inline
std::chrono::system_clock::time_point delay(int secs, int msecs=0, int nsecs=0) {
std::chrono::system_clock::time_point delay(int secs, int msecs = 0, int /*nsecs*/ = 0) {
std::chrono::system_clock::time_point t = std::chrono::system_clock::now();
t += std::chrono::seconds( secs);
t += std::chrono::milliseconds( msecs);
@@ -77,11 +77,11 @@ void wait_fn(
boost::fibers::condition_variable & cond) {
std::unique_lock< boost::fibers::mutex > lk( mtx);
cond.wait( lk);
++value;
++value1;
}
void test_one_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable cond;
@@ -90,23 +90,23 @@ void test_one_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::dispatch,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
BOOST_CHECK_EQUAL( 1, value);
BOOST_CHECK_EQUAL( 1, value1);
}
void test_two_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable cond;
@@ -115,37 +115,37 @@ void test_two_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::dispatch,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::dispatch,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::dispatch,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 1, value);
BOOST_CHECK_EQUAL( 1, value1);
f1.join();
f2.join();
f3.join();
f4.join();
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
}
void test_two_waiter_notify_all() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable cond;
@@ -154,33 +154,33 @@ void test_two_waiter_notify_all() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::dispatch,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::dispatch,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::dispatch,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
boost::fibers::fiber f5(
boost::fibers::launch::dispatch,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
f1.join();
f2.join();
@@ -188,7 +188,7 @@ void test_two_waiter_notify_all() {
f4.join();
f5.join();
BOOST_CHECK_EQUAL( 3, value);
BOOST_CHECK_EQUAL( 3, value1);
}
int test1 = 0;
test/test_condition_variable_post.cpp
+20 -20
View File
@@ -22,10 +22,10 @@
typedef std::chrono::nanoseconds ns;
typedef std::chrono::milliseconds ms;
int value = 0;
int value1 = 0;
inline
std::chrono::system_clock::time_point delay(int secs, int msecs=0, int nsecs=0) {
std::chrono::system_clock::time_point delay(int secs, int msecs = 0, int /*nsecs*/ = 0) {
std::chrono::system_clock::time_point t = std::chrono::system_clock::now();
t += std::chrono::seconds( secs);
t += std::chrono::milliseconds( msecs);
@@ -77,11 +77,11 @@ void wait_fn(
boost::fibers::condition_variable & cond) {
std::unique_lock< boost::fibers::mutex > lk( mtx);
cond.wait( lk);
++value;
++value1;
}
void test_one_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable cond;
@@ -90,23 +90,23 @@ void test_one_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::post,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
BOOST_CHECK_EQUAL( 1, value);
BOOST_CHECK_EQUAL( 1, value1);
}
void test_two_waiter_notify_one() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable cond;
@@ -115,37 +115,37 @@ void test_two_waiter_notify_one() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::post,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::post,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::post,
notify_one_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
f3.join();
f4.join();
BOOST_CHECK_EQUAL( 2, value);
BOOST_CHECK_EQUAL( 2, value1);
}
void test_two_waiter_notify_all() {
value = 0;
value1 = 0;
boost::fibers::mutex mtx;
boost::fibers::condition_variable cond;
@@ -154,33 +154,33 @@ void test_two_waiter_notify_all() {
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f2(
boost::fibers::launch::post,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f3(
boost::fibers::launch::post,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f4(
boost::fibers::launch::post,
wait_fn,
std::ref( mtx),
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
boost::fibers::fiber f5(
boost::fibers::launch::post,
notify_all_fn,
std::ref( cond) );
BOOST_CHECK_EQUAL( 0, value);
BOOST_CHECK_EQUAL( 0, value1);
f1.join();
f2.join();
@@ -188,7 +188,7 @@ void test_two_waiter_notify_all() {
f4.join();
f5.join();
BOOST_CHECK_EQUAL( 3, value);
BOOST_CHECK_EQUAL( 3, value1);
}
int test1 = 0;
test/test_fiber_dispatch.cpp
+2 -3
View File
@@ -256,15 +256,14 @@ void test_join_bind() {
{
value1 = 0;
value2 = "";
int i = 3;
std::string abc("abc");
boost::fibers::fiber f(
boost::fibers::launch::dispatch, std::bind(
[]( int i, std::string & str) {
[](std::string & str) {
value1 = 3;
value2 = str;
},
i, abc
abc
));
f.join();
BOOST_CHECK_EQUAL( value1, 3);
test/test_fiber_post.cpp
+2 -3
View File
@@ -256,15 +256,14 @@ void test_join_bind() {
{
value1 = 0;
value2 = "";
int i = 3;
std::string abc("abc");
boost::fibers::fiber f(
boost::fibers::launch::post, std::bind(
[]( int i, std::string & str) {
[](std::string & str) {
value1 = 3;
value2 = str;
},
i, abc
abc
));
f.join();
BOOST_CHECK_EQUAL( value1, 3);
test/test_future_dispatch.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {
test/test_future_post.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {
test/test_packaged_task_dispatch.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {
test/test_packaged_task_post.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {
test/test_promise_dispatch.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ struct A {
A & operator=( A const&) = delete;
A & operator=( A &&) = default;
int value;
int value{ 0 };
};
void fn1( boost::fibers::promise< int > * p, int i) {
@@ -74,7 +74,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {
test/test_promise_post.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ struct A {
A & operator=( A const&) = delete;
A & operator=( A &&) = default;
int value;
int value{ 0 };
};
void fn1( boost::fibers::promise< int > * p, int i) {
@@ -74,7 +74,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {
test/test_shared_future_dispatch.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {
test/test_shared_future_post.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ int fn8( int i) {
A fn9() {
A a;
a.value = 3;
return std::move( a);
return a;
}
A fn10() {