Fix compilation errors

ton-blockchain · Nov 29, 2024 · ea73a3b · ea73a3b
1 parent 0280a28
commit ea73a3b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/tdutils/td/utils/Timer.cpp b/tdutils/td/utils/Timer.cpp
@@ -23,6 +23,7 @@
 #include "td/utils/Time.h"
 
 #include <numeric>
+#include <algorithm>
 
 namespace td {
 

diff --git a/validator-engine/validator-engine.cpp b/validator-engine/validator-engine.cpp
@@ -472,7 +472,7 @@ td::Result<bool> 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<bool> 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/collator-node.cpp b/validator/collator-node.cpp
@@ -70,15 +70,15 @@ 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();
   collating_shards_.push_back(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<ton_api::collatorNode_Candidate> CollatorNode::serialize_candidate(const BlockCandidate& block,

diff --git 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) {