import quincy beta 17.1.0

[ceph.git] / ceph / src / mgr / ServiceMap.cc

diff --git a/ceph/src/mgr/ServiceMap.cc b/ceph/src/mgr/ServiceMap.cc
index b6f8ad97c86d103be1db55a58169244bcf1ec3b2..fd91d19abb032667080ee7f497c685ba02de68c6 100644 (file)
--- a/ceph/src/mgr/ServiceMap.cc
+++ b/ceph/src/mgr/ServiceMap.cc
@@ -3,9 +3,7 @@
 
 #include "mgr/ServiceMap.h"
 
-#include <experimental/iterator>
 #include <fmt/format.h>
-#include <regex>
 
 #include "common/Formatter.h"
 
@@ -100,8 +98,8 @@ std::string ServiceMap::Service::get_summary() const
        p != d.second.metadata.end()) {
       type = p->second;
     }
-    for (auto k : {make_pair("zone", "zone_id"),
-         make_pair("host", "hostname")}) {
+    for (auto k : {std::make_pair("zone", "zone_id"),
+                  std::make_pair("host", "hostname")}) {
       auto p = d.second.metadata.find(k.second);
       if (p != d.second.metadata.end()) {
        groupings[k.first].insert(p->second);