update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rgw / rgw_frontend.cc

diff --git a/ceph/src/rgw/rgw_frontend.cc b/ceph/src/rgw/rgw_frontend.cc
index 1d61a8fead10269054c2d53c368cb698ca6d73d6..f22ec12454c1085acc02bf6aca32ee3a92457960 100644 (file)
--- a/ceph/src/rgw/rgw_frontend.cc
+++ b/ceph/src/rgw/rgw_frontend.cc
@@ -6,7 +6,7 @@
 #include "rgw_frontend.h"
 #include "include/str_list.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 
 #define dout_context g_ceph_context
@@ -15,12 +15,7 @@
 int RGWFrontendConfig::parse_config(const string& config,
                                    std::multimap<string, string>& config_map)
 {
-  list<string> config_list;
-  get_str_list(config, " ", config_list);
-
-  list<string>::iterator iter;
-  for (iter = config_list.begin(); iter != config_list.end(); ++iter) {
-    string& entry = *iter;
+  for (auto& entry : get_str_vec(config, " ")) {
     string key;
     string val;