dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix (#1790) merge conflict

Browse source
This commit is contained in:
SergiySW 2019-03-13 14:39:51 +03:00
commit 530864623f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nano/node/bootstrap.cpp
View file

@ -98,7 +98,7 @@ void nano::socket::close ()
void nano::socket::checkup (uint64_t timeout_a) void nano::socket::checkup (uint64_t timeout_a)
{ {
std::weak_ptr<nano::socket> this_w (shared_from_this ()); std::weak_ptr<nano::socket> this_w (shared_from_this ());
node->alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (nano::is_test_network ? 1 : 10), [this_w, timeout_a]() { node->alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (node->network_params.is_test_network () ? 1 : 10), [this_w, timeout_a]() {
if (auto this_l = this_w.lock ()) if (auto this_l = this_w.lock ())
{ {
if (this_l->async_start_time != std::numeric_limits<uint64_t>::max () && this_l->async_start_time + timeout_a < static_cast<uint64_t> (std::chrono::steady_clock::now ().time_since_epoch ().count ())) if (this_l->async_start_time != std::numeric_limits<uint64_t>::max () && this_l->async_start_time + timeout_a < static_cast<uint64_t> (std::chrono::steady_clock::now ().time_since_epoch ().count ()))