Remove compiler warnings (incl from third party headers) (nanocurrenc…

…y#2072) * Remove compiler warnings * Fix new warnings in test * Remove new msvc warnings
Exxenoz · Jul 12, 2019 · f8158fc · f8158fc
1 parent 7890e4e
commit f8158fc
Show file tree

Hide file tree

Showing 69 changed files with 179 additions and 502 deletions.
diff --git a/.clang-format.base b/.clang-format.base
@@ -45,7 +45,7 @@ IncludeCategories:
   - Regex:           '<boost/.*>'
     Priority:        4
   # Headers in other third party libraries
-  - Regex:           '<(gtest|crypto)/([A-Za-z0-9.\/-_])+>'
+  - Regex:           '<(gtest|crypto|miniupnp)/([A-Za-z0-9.\/-_])+>'
     Priority:        3
   # Headers from nano workspace.
   - Regex:           '<nano/([A-Za-z0-9.\/-_])+>'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ if (WIN32)
 	endif()
 
 else ()
-	add_compile_options(-Werror=switch)
+	add_compile_options(-Werror)
 
 	if ((${USING_TSAN} AND ${USING_ASAN}) OR
 	    (${USING_TSAN} AND ${USING_ASAN_INT}))

diff --git a/crypto/ed25519-donna/ed25519-donna-portable.h b/crypto/ed25519-donna/ed25519-donna-portable.h
@@ -20,6 +20,7 @@
 	#include <sys/param.h>
 	#define DONNA_INLINE inline __attribute__((always_inline))
 	#define DONNA_NOINLINE __attribute__((noinline))
+	#undef ALIGN
 	#define ALIGN(x) __attribute__((aligned(x)))
 	#define ROTL32(a,b) (((a) << (b)) | ((a) >> (32 - b)))
 	#define ROTR32(a,b) (((a) >> (b)) | ((a) << (32 - b)))

diff --git a/nano/boost/asio.hpp b/nano/boost/asio.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable : 4191)
+#pragma warning(disable : 4242)
+#endif
+
+#include <boost/asio.hpp>
+
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
diff --git a/nano/boost/beast.hpp b/nano/boost/beast.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable : 4191)
+#pragma warning(disable : 4242)
+#endif
+
+#include <boost/beast.hpp>
+
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
diff --git a/nano/boost/process.hpp b/nano/boost/process.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#ifndef BOOST_PROCESS_SUPPORTED
+#error BOOST_PROCESS_SUPPORTED must be set, check configuration
+#endif
+
+#if BOOST_PROCESS_SUPPORTED
+
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable : 4191)
+#pragma warning(disable : 4242)
+#pragma warning(disable : 4244)
+#endif
+
+#include <boost/process.hpp>
+
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
+
+#endif
diff --git a/nano/boost/readme.txt b/nano/boost/readme.txt
@@ -0,0 +1 @@
+These are files which wrap other boost files and suppress compiler warnings associated with them.
diff --git a/nano/core_test/CMakeLists.txt b/nano/core_test/CMakeLists.txt
@@ -8,7 +8,6 @@ add_executable (core_test
 	difficulty.cpp
 	entry.cpp
 	gap_cache.cpp
-	interface.cpp
 	ipc.cpp
 	ledger.cpp
 	logger.cpp

diff --git a/nano/core_test/block.cpp b/nano/core_test/block.cpp
@@ -1,5 +1,4 @@
 #include <nano/core_test/testutil.hpp>
-#include <nano/lib/interface.h>
 #include <nano/node/common.hpp>
 #include <nano/node/node.hpp>
 

diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp
@@ -1494,7 +1494,7 @@ TEST (block_store, peers)
 TEST (block_store, endpoint_key_byte_order)
 {
 	boost::asio::ip::address_v6 address (boost::asio::ip::address_v6::from_string ("::ffff:127.0.0.1"));
-	auto port = 100;
+	uint16_t port = 100;
 	nano::endpoint_key endpoint_key (address.to_bytes (), port);
 
 	std::vector<uint8_t> bytes;

diff --git a/nano/core_test/entry.cpp b/nano/core_test/entry.cpp
@@ -8,14 +8,14 @@ TEST (basic, basic)
 TEST (asan, DISABLED_memory)
 {
 // Ignore warning with gcc/clang compilers
-#ifndef MSVC
+#ifndef _WIN32
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
 	uint8_t array[1];
 	auto value (array[-0x800000]);
 	(void)value;
-#ifndef MSVC
+#ifndef _WIN32
 #pragma GCC diagnostic pop
 #endif
 }
diff --git a/nano/core_test/interface.cpp b/nano/core_test/interface.cpp
diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
@@ -257,7 +257,7 @@ TEST (node, auto_bootstrap)
 		ASSERT_NO_ERROR (system.poll ());
 	};
 	system.deadline_set (5s);
-	while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_quorum, nano::stat::dir::out) < 0 || node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_conf_height, nano::stat::dir::out) < 0)
+	while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_quorum, nano::stat::dir::out) == 0 || node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_conf_height, nano::stat::dir::out) == 0)
 	{
 		ASSERT_NO_ERROR (system.poll ());
 	}
@@ -1635,7 +1635,7 @@ TEST (node, broadcast_elected)
 			ASSERT_NO_ERROR (ec);
 		}
 		system.deadline_set (5s);
-		while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_inactive, nano::stat::dir::out) < 0)
+		while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_inactive, nano::stat::dir::out) == 0)
 		{
 			ASSERT_NO_ERROR (system.poll ());
 		}

diff --git a/nano/core_test/peer_container.cpp b/nano/core_test/peer_container.cpp
@@ -88,7 +88,7 @@ TEST (channels, fill_random_clear)
 TEST (channels, fill_random_full)
 {
 	nano::system system (24000, 1);
-	for (auto i (0); i < 100; ++i)
+	for (uint16_t i (0u); i < 100u; ++i)
 	{
 		system.nodes[0]->network.udp_channels.insert (nano::endpoint (boost::asio::ip::address_v6::loopback (), i), 0);
 	}

diff --git a/nano/core_test/socket.cpp b/nano/core_test/socket.cpp
@@ -27,6 +27,15 @@ TEST (socket, concurrent_writes)
 	std::function<void(std::shared_ptr<nano::socket>)> reader = [&read_count_completion, &total_message_count, &reader](std::shared_ptr<nano::socket> socket_a) {
 		auto buff (std::make_shared<std::vector<uint8_t>> ());
 		buff->resize (1);
+#ifndef _WIN32
+#pragma GCC diagnostic push
+#if defined(__has_warning)
+#if __has_warning("-Wunused-lambda-capture")
+/** total_message_count is constexpr and a capture isn't needed. However, removing it fails to compile on VS2017 due to a known compiler bug. */
+#pragma GCC diagnostic ignored "-Wunused-lambda-capture"
+#endif
+#endif
+#endif
 		socket_a->async_read (buff, 1, [&read_count_completion, &reader, &total_message_count, socket_a, buff](boost::system::error_code const & ec, size_t size_a) {
 			if (!ec)
 			{
@@ -40,6 +49,9 @@ TEST (socket, concurrent_writes)
 				std::cerr << "async_read: " << ec.message () << std::endl;
 			}
 		});
+#ifndef _WIN32
+#pragma GCC diagnostic pop
+#endif
 	};
 
 	boost::asio::ip::tcp::endpoint endpoint (boost::asio::ip::address_v4::any (), 25000);
@@ -90,8 +102,15 @@ TEST (socket, concurrent_writes)
 	std::vector<std::thread> client_threads;
 	for (int i = 0; i < client_count; i++)
 	{
-		// Note: this gives a warning on most compilers because message_count is constexpr and a
-		// capture isn't needed. However, removing it fails to compile on VS2017 due to a known compiler bug.
+#ifndef _WIN32
+#pragma GCC diagnostic push
+#if defined(__has_warning)
+#if __has_warning("-Wunused-lambda-capture")
+/** total_message_count is constexpr and a capture isn't needed. However, removing it fails to compile on VS2017 due to a known compiler bug. */
+#pragma GCC diagnostic ignored "-Wunused-lambda-capture"
+#endif
+#endif
+#endif
 		client_threads.emplace_back ([&client, &message_count]() {
 			for (int i = 0; i < message_count; i++)
 			{
@@ -100,6 +119,9 @@ TEST (socket, concurrent_writes)
 				client->async_write (buff);
 			}
 		});
+#ifndef _WIN32
+#pragma GCC diagnostic pop
+#endif
 	}
 
 	ASSERT_FALSE (read_count_completion.await_count_for (10s));
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		These are files which wrap other boost files and suppress compiler warnings associated with them.