From 3f5205ad6bb4016a027760bcc0495c35e183135e Mon Sep 17 00:00:00 2001 From: John Jones Date: Fri, 28 Dec 2018 14:19:19 -0500 Subject: [PATCH 1/4] Fix warnings in tests --- tests/network/http/websocket_test.cpp | 2 +- tests/thread/parallel_tests.cpp | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/network/http/websocket_test.cpp b/tests/network/http/websocket_test.cpp index 3f89283..10068b0 100644 --- a/tests/network/http/websocket_test.cpp +++ b/tests/network/http/websocket_test.cpp @@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(websocket_test) server.listen( port ); listen_ok = true; } - catch( std::exception ) + catch( std::exception& ignore ) { // if the port is busy, listen() will throw a std::exception, do nothing here. } diff --git a/tests/thread/parallel_tests.cpp b/tests/thread/parallel_tests.cpp index 7da4c7b..bef2b6b 100644 --- a/tests/thread/parallel_tests.cpp +++ b/tests/thread/parallel_tests.cpp @@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE( do_something_parallel ) { // check that thread_local_storage counter works std::sort( pair.second.begin(), pair.second.end() ); for( size_t i = 0; i < pair.second.size(); i++ ) - BOOST_CHECK_EQUAL( i, pair.second[i] ); + BOOST_CHECK_EQUAL( (int64_t)i, pair.second[i] ); } } @@ -205,7 +205,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) auto p1 = fc::async([&counter,&valve,syncer,waiter] () { valve.do_serial( [syncer,waiter](){ syncer->set_value(); fc::future( fc::shared_ptr>( waiter, true ) ).wait(); }, - [&counter](){ BOOST_CHECK_EQUAL( 0, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 0u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) syncer = new fc::promise(); auto p2 = fc::async([&counter,&valve,syncer] () { valve.do_serial( [syncer](){ syncer->set_value(); }, - [&counter](){ BOOST_CHECK_EQUAL( 1, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 1u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) BOOST_CHECK( p1.ready() ); BOOST_CHECK( p2.ready() ); - BOOST_CHECK_EQUAL( 2, counter.load() ); + BOOST_CHECK_EQUAL( 2u, counter.load() ); } { // Triple test, f3 finishes first, then f1, finally f2 @@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) auto p1 = fc::async([&counter,&valve,syncer,waiter] () { valve.do_serial( [&syncer,waiter](){ syncer->set_value(); fc::future( fc::shared_ptr>( waiter, true ) ).wait(); }, - [&counter](){ BOOST_CHECK_EQUAL( 0, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 0u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -254,7 +254,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) auto p2 = fc::async([&counter,&valve,syncer] () { valve.do_serial( [&syncer](){ syncer->set_value(); fc::usleep( fc::milliseconds(100) ); }, - [&counter](){ BOOST_CHECK_EQUAL( 1, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 1u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) syncer = new fc::promise(); auto p3 = fc::async([&counter,&valve,syncer] () { valve.do_serial( [syncer](){ syncer->set_value(); }, - [&counter](){ BOOST_CHECK_EQUAL( 2, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 2u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) BOOST_CHECK( p1.ready() ); BOOST_CHECK( p2.ready() ); BOOST_CHECK( p3.ready() ); - BOOST_CHECK_EQUAL( 3, counter.load() ); + BOOST_CHECK_EQUAL( 3u, counter.load() ); } { // Triple test again but with invocations from different threads @@ -294,7 +294,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) auto p1 = fc::do_parallel([&counter,&valve,syncer,waiter] () { valve.do_serial( [&syncer,waiter](){ syncer->set_value(); fc::future( fc::shared_ptr>( waiter, true ) ).wait(); }, - [&counter](){ BOOST_CHECK_EQUAL( 0, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 0u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) auto p2 = fc::do_parallel([&counter,&valve,syncer] () { valve.do_serial( [&syncer](){ syncer->set_value(); fc::usleep( fc::milliseconds(100) ); }, - [&counter](){ BOOST_CHECK_EQUAL( 1, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 1u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) syncer = new fc::promise(); auto p3 = fc::do_parallel([&counter,&valve,syncer] () { valve.do_serial( [syncer](){ syncer->set_value(); }, - [&counter](){ BOOST_CHECK_EQUAL( 2, counter.load() ); + [&counter](){ BOOST_CHECK_EQUAL( 2u, counter.load() ); counter.fetch_add(1); } ); }); fc::future( fc::shared_ptr>( syncer, true ) ).wait(); @@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE( serial_valve ) BOOST_CHECK( p1.ready() ); BOOST_CHECK( p2.ready() ); BOOST_CHECK( p3.ready() ); - BOOST_CHECK_EQUAL( 3, counter.load() ); + BOOST_CHECK_EQUAL( 3u, counter.load() ); } } From e1bb7c6e14aceb7340a70af8b1ad3df238d1b9d3 Mon Sep 17 00:00:00 2001 From: John Jones Date: Fri, 28 Dec 2018 14:19:49 -0500 Subject: [PATCH 2/4] Add compiler switches to squelch some warnings --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 593231a..93b54d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,7 +338,7 @@ ELSE() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -stdlib=libc++ -Wall") ELSE() if( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) - target_compile_options(fc PUBLIC ${CPP_STANDARD} -Wall -fnon-call-exceptions) + target_compile_options(fc PUBLIC ${CPP_STANDARD} -Wall -Wno-parentheses -Wno-class-memaccess -fnon-call-exceptions) endif() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -Wall -fnon-call-exceptions") From 51f27f1fcdbaf29148fb77cae3c1cbab2f90da3d Mon Sep 17 00:00:00 2001 From: John Jones Date: Fri, 28 Dec 2018 14:49:17 -0500 Subject: [PATCH 3/4] Fix stacktrace test --- tests/stacktrace_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/stacktrace_test.cpp b/tests/stacktrace_test.cpp index 098d732..452a63e 100644 --- a/tests/stacktrace_test.cpp +++ b/tests/stacktrace_test.cpp @@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(static_variant_depth_test) int count = 0; for( const auto& line : lines ) if( line.find("_svdt_visitor") != std::string::npos ) count++; - BOOST_CHECK_LT( 3, count ); // test.visit(), static_variant::visit, function object, visitor + BOOST_CHECK_LT( 2, count ); // test.visit(), static_variant::visit, function object, visitor BOOST_CHECK_GT( 8, count ); // some is implementation-dependent } #endif From 1ed9b4f98f8d2d20c092edfad5fa93db32e6b3c4 Mon Sep 17 00:00:00 2001 From: John Jones Date: Tue, 1 Jan 2019 10:25:57 -0500 Subject: [PATCH 4/4] Revert -Wno-??? change --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93b54d4..593231a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,7 +338,7 @@ ELSE() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -stdlib=libc++ -Wall") ELSE() if( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) - target_compile_options(fc PUBLIC ${CPP_STANDARD} -Wall -Wno-parentheses -Wno-class-memaccess -fnon-call-exceptions) + target_compile_options(fc PUBLIC ${CPP_STANDARD} -Wall -fnon-call-exceptions) endif() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -Wall -fnon-call-exceptions")