Fix GCC 7 warnings.

2 files changed, 6 insertions, 4 deletions

diff --git a/tde2e/td/e2e/Blockchain.cpp b/tde2e/td/e2e/Blockchain.cpp
index a477beade..fc0979668 100644
--- a/tde2e/td/e2e/Blockchain.cpp
+++ b/tde2e/td/e2e/Blockchain.cpp
@@ -370,8 +370,8 @@ td::Status State::set_group_state(GroupStateRef group_state, const Permissions &
   }
 
   td::int32 needed_flags = 0;
-  for (const auto &[p, flags] : old_participants) {
-    if (!new_participants.count(p)) {
+  for (const auto &participant : old_participants) {
+    if (!new_participants.count(participant.first)) {
       if (!permissions.may_remove_users()) {
         return Error(E::InvalidBlock_NoPermissions, "Can't remove users");
       }
diff --git a/tde2e/td/e2e/Call.cpp b/tde2e/td/e2e/Call.cpp
index 00e1c2911..347d58dd5 100644
--- a/tde2e/td/e2e/Call.cpp
+++ b/tde2e/td/e2e/Call.cpp
@@ -369,7 +369,8 @@ td::Result<std::string> CallEncryption::encrypt(td::int32 channel_id, td::Slice
   using td::store;
   std::string header_a = lambda_serialize([&](auto &storer) {
     store(epochs_n, storer);
-    for (auto &[epoch_i, epoch] : epochs_) {
+    for (const auto &it : epochs_) {
+      const auto &epoch = it.second;
       store(epoch.epoch_hash_, storer);
     }
   });
@@ -380,7 +381,8 @@ td::Result<std::string> CallEncryption::encrypt(td::int32 channel_id, td::Slice
                                                           decrypted_data, one_time_secret));
 
   std::vector<td::SecureString> encrypted_headers;
-  for (auto &[epoch_i, epoch] : epochs_) {
+  for (const auto &it : epochs_) {
+    const auto &epoch = it.second;
     TRY_RESULT(encrypted_header, MessageEncryption::encrypt_header(one_time_secret, encrypted_packet, epoch.secret_));
     encrypted_headers.emplace_back(std::move(encrypted_header));
   }