diff --git a/tdutils/td/utils/Timer.cpp b/tdutils/td/utils/Timer.cpp index c2c67895..abb69b10 100644 --- a/tdutils/td/utils/Timer.cpp +++ b/tdutils/td/utils/Timer.cpp @@ -23,6 +23,7 @@ #include "td/utils/Time.h" #include +#include namespace td { diff --git a/validator-engine/validator-engine.cpp b/validator-engine/validator-engine.cpp index 3b9715b3..2e03ce45 100644 --- a/validator-engine/validator-engine.cpp +++ b/validator-engine/validator-engine.cpp @@ -472,7 +472,7 @@ td::Result Config::config_add_collator(ton::adnl::AdnlNodeIdShort addr, to return td::Status::Error(PSTRING() << "invalid shard: " << shard.to_str()); } auto& shards = collators[addr]; - if (std::ranges::find(shards, shard) != collators[addr].end()) { + if (std::find(shards.begin(), shards.end(), shard) != shards.end()) { return false; } shards.push_back(shard); @@ -484,7 +484,7 @@ td::Result Config::config_del_collator(ton::adnl::AdnlNodeIdShort addr, to return td::Status::Error(PSTRING() << "invalid shard: " << shard.to_str()); } auto& shards = collators[addr]; - auto it = std::ranges::find(shards, shard); + auto it = std::find(shards.begin(), shards.end(), shard); if (it == shards.end()) { return false; } @@ -1605,7 +1605,7 @@ void ValidatorEngine::set_shard_check_function() { shards.push_back(s); } std::sort(shards.begin(), shards.end()); - shards.erase(std::ranges::unique(shards).begin(), shards.end()); + shards.erase(std::unique(shards.begin(), shards.end()), shards.end()); validator_options_.write().set_shard_check_function( [shards = std::move(shards)](ton::ShardIdFull shard) -> bool { for (auto s : shards) { diff --git a/validator/collation-manager.cpp b/validator/collation-manager.cpp index 879b8d89..eb9aa626 100644 --- a/validator/collation-manager.cpp +++ b/validator/collation-manager.cpp @@ -321,7 +321,7 @@ void CollationManager::alarm() { if (collator.ping_at.is_in_past()) { collator.sent_ping = true; td::BufferSlice query = create_serialize_tl_object(0); - td::Promise P = [=, SelfId = actor_id(this)](td::Result R) mutable { + td::Promise P = [=, id = id, SelfId = actor_id(this)](td::Result R) mutable { td::actor::send_closure(SelfId, &CollationManager::got_pong, id, std::move(R)); }; LOG(DEBUG) << "sending ping to " << id; diff --git a/validator/collator-node.cpp b/validator/collator-node.cpp index 869ac9ba..94bb18a1 100644 --- a/validator/collator-node.cpp +++ b/validator/collator-node.cpp @@ -70,7 +70,7 @@ void CollatorNode::tear_down() { void CollatorNode::add_shard(ShardIdFull shard) { CHECK(shard.is_valid_ext() && !shard.is_masterchain()); - if (std::ranges::find(collating_shards_, shard) != collating_shards_.end()) { + if (std::find(collating_shards_.begin(), collating_shards_.end(), shard) != collating_shards_.end()) { return; } LOG(INFO) << "Collator node: local_id=" << local_id_ << " , shard=" << shard.to_str(); @@ -78,7 +78,7 @@ void CollatorNode::add_shard(ShardIdFull shard) { } void CollatorNode::del_shard(ShardIdFull shard) { - auto it = std::ranges::find(collating_shards_, shard); + auto it = std::find(collating_shards_.begin(), collating_shards_.end(), shard); if (it != collating_shards_.end()) { collating_shards_.erase(it); } @@ -608,8 +608,8 @@ void CollatorNode::process_ping(adnl::AdnlNodeIdShort src, ton_api::collatorNode } bool CollatorNode::can_collate_shard(ShardIdFull shard) const { - return std::ranges::any_of(collating_shards_, - [&](const ShardIdFull& our_shard) { return shard_intersects(shard, our_shard); }); + return std::any_of(collating_shards_.begin(), collating_shards_.end(), + [&](const ShardIdFull& our_shard) { return shard_intersects(shard, our_shard); }); } tl_object_ptr CollatorNode::serialize_candidate(const BlockCandidate& block, diff --git a/validator/full-node.cpp b/validator/full-node.cpp index e7527d76..37439713 100644 --- a/validator/full-node.cpp +++ b/validator/full-node.cpp @@ -936,9 +936,9 @@ bool FullNodeConfig::operator!=(const FullNodeConfig &rhs) const { } bool CustomOverlayParams::send_shard(const ShardIdFull &shard) const { - return sender_shards_.empty() || std::ranges::any_of(sender_shards_, [&](const ShardIdFull &our_shard) { - return shard_intersects(shard, our_shard); - }); + return sender_shards_.empty() || + std::any_of(sender_shards_.begin(), sender_shards_.end(), + [&](const ShardIdFull &our_shard) { return shard_intersects(shard, our_shard); }); } CustomOverlayParams CustomOverlayParams::fetch(const ton_api::engine_validator_customOverlay& f) {