Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add GSL-style narrow_cast #2567

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Add GSL-style narrow_cast #2567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd7b092
Add GSL-style narrow_cast
cryptocode Feb 14, 2020
61e0e49
Merge develop
cryptocode Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions nano/lib/utility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <nano/lib/locks.hpp>

#include <cassert>
#include <functional>
#include <mutex>
#include <vector>
Expand Down Expand Up @@ -161,6 +162,15 @@ void transform_if (InputIt first, InputIt last, OutputIt dest, Pred pred, Func t
++first;
}
}

/** Safe narrowing cast which silences warnings and asserts on data loss in debug builds. This is optimized away. */
template <typename TARGET_TYPE, typename SOURCE_TYPE>
constexpr TARGET_TYPE narrow_cast (SOURCE_TYPE const & val)
{
auto res (static_cast<TARGET_TYPE> (val));
assert (val == static_cast<SOURCE_TYPE> (res));
return res;
}
}

void release_assert_internal (bool check, const char * check_expr, const char * file, unsigned int line);
Expand Down
8 changes: 4 additions & 4 deletions nano/node/election.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ void nano::election::confirm_once (nano::election_status_type type_a)
status.election_end = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ());
status.election_duration = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::steady_clock::now () - election_start);
status.confirmation_request_count = confirmation_request_count;
status.block_count = blocks.size ();
status.voter_count = last_votes.size ();
status.block_count = nano::narrow_cast<decltype (status.block_count)> (blocks.size ());
status.voter_count = nano::narrow_cast<decltype (status.voter_count)> (last_votes.size ());
status.type = type_a;
auto status_l (status);
auto node_l (node.shared ());
Expand All @@ -57,8 +57,8 @@ void nano::election::stop ()
status.election_end = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ());
status.election_duration = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::steady_clock::now () - election_start);
status.confirmation_request_count = confirmation_request_count;
status.block_count = blocks.size ();
status.voter_count = last_votes.size ();
status.block_count = nano::narrow_cast<decltype (status.block_count)> (blocks.size ());
status.voter_count = nano::narrow_cast<decltype (status.voter_count)> (last_votes.size ());
status.type = nano::election_status_type::stopped;
}
}
Expand Down
2 changes: 1 addition & 1 deletion nano/node/telemetry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ nano::telemetry_data nano::local_telemetry_data (nano::ledger_cache const & ledg
telemetry_data.uptime = std::chrono::duration_cast<std::chrono::seconds> (std::chrono::steady_clock::now () - statup_time_a).count ();
telemetry_data.unchecked_count = ledger_cache_a.unchecked_count;
telemetry_data.genesis_block = network_params_a.ledger.genesis_hash;
telemetry_data.peer_count = network_a.size ();
telemetry_data.peer_count = nano::narrow_cast<decltype (telemetry_data.peer_count)> (network_a.size ());
telemetry_data.account_count = ledger_cache_a.account_count;
telemetry_data.major_version = nano::get_major_node_version ();
telemetry_data.minor_version = nano::get_minor_node_version ();
Expand Down