From 7b9e59f3a453112cb49329f186e69a6db40c4bda Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 24 May 2018 08:28:09 -0500
Subject: [PATCH] mon/MonMap: use c++17 structured bindings

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/mon/MonMap.cc | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index ed0f9c7dc4b24..3cad9dea48aec 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -109,10 +109,8 @@ void MonMap::encode(bufferlist& blist, uint64_t con_features) const
   }
 
   map<string,entity_addr_t> legacy_mon_addr;
-  for (map<string,mon_info_t>::const_iterator p = mon_info.begin();
-       p != mon_info.end();
-       ++p) {
-    legacy_mon_addr[p->first] = p->second.public_addr;
+  for (auto& [name, info] : mon_info) {
+    legacy_mon_addr[name] = info.public_addr;
   }
 
   if ((con_features & CEPH_FEATURE_MONENC) == 0) {
@@ -187,10 +185,10 @@ void MonMap::decode(bufferlist::const_iterator& p)
   }
   if (struct_v < 5) {
     // generate mon_info from legacy mon_addr
-    for (auto& p : mon_addr) {
-      mon_info_t &m = mon_info[p.first];
-      m.name = p.first;
-      m.public_addr = p.second;
+    for (auto& [name, addr] : mon_addr) {
+      mon_info_t &m = mon_info[name];
+      m.name = name;
+      m.public_addr = addr;
     }
   } else {
     decode(mon_info, p);
-- 
2.39.5