From 0acfd548ca199eaafc6befd47d14e4d749ba1ee4 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Fri, 20 Jan 2023 20:26:48 +0000 Subject: [PATCH] Fix several sign comparison mismatches identified by msvc. --- nano/node/backlog_population.cpp | 2 +- nano/node/node.cpp | 2 +- nano/node/socket.cpp | 4 ++-- nano/slow_test/vote_processor.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nano/node/backlog_population.cpp b/nano/node/backlog_population.cpp index 0ee6a2a8..896db725 100644 --- a/nano/node/backlog_population.cpp +++ b/nano/node/backlog_population.cpp @@ -87,7 +87,7 @@ void nano::backlog_population::populate_backlog () { auto transaction = store.tx_begin_read (); - auto count = 0; + auto count = 0u; auto i = store.account.begin (transaction, next); const auto end = store.account.end (); for (; !stopped && i != end && count < chunk_size; ++i, ++count, ++total) diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 45161960..9e71ad25 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -1465,7 +1465,7 @@ void nano::node::process_confirmed_data (nano::transaction const & transaction_a void nano::node::process_confirmed (nano::election_status const & status_a, uint64_t iteration_a) { auto hash (status_a.winner->hash ()); - auto const num_iters = (config.block_processor_batch_max_time / network_params.node.process_confirmed_interval) * 4; + decltype (iteration_a) const num_iters = (config.block_processor_batch_max_time / network_params.node.process_confirmed_interval) * 4; if (auto block_l = ledger.store.block.get (ledger.store.tx_begin_read (), hash)) { active.recently_confirmed.put (block_l->qualified_root (), hash); diff --git a/nano/node/socket.cpp b/nano/node/socket.cpp index dbfaafa6..5b0643ac 100644 --- a/nano/node/socket.cpp +++ b/nano/node/socket.cpp @@ -212,7 +212,7 @@ void nano::socket::checkup () auto condition_to_disconnect{ false }; // if this is a server socket, and no data is received for silent_connection_tolerance_time seconds then disconnect - if (this_l->endpoint_type () == endpoint_type_t::server && (now - this_l->last_receive_time_or_init) > this_l->silent_connection_tolerance_time.count ()) + if (this_l->endpoint_type () == endpoint_type_t::server && (now - this_l->last_receive_time_or_init) > static_cast (this_l->silent_connection_tolerance_time.count ())) { this_l->node.stats.inc (nano::stat::type::tcp, nano::stat::detail::tcp_silent_connection_drop, nano::stat::dir::in); condition_to_disconnect = true; @@ -540,4 +540,4 @@ std::string nano::socket_type_to_string (nano::socket::type_t type) return "realtime_response_server"; } return "n/a"; -} \ No newline at end of file +} diff --git a/nano/slow_test/vote_processor.cpp b/nano/slow_test/vote_processor.cpp index 0130475c..eaae3557 100644 --- a/nano/slow_test/vote_processor.cpp +++ b/nano/slow_test/vote_processor.cpp @@ -58,7 +58,7 @@ TEST (vote_processor, producer_consumer) // Run multiple producers in parallel std::vector producers; - for (int n = 0; n < number_of_producers; ++n) + for (size_t n = 0; n < number_of_producers; ++n) { producers.emplace_back (producer); }