import quincy beta 17.1.0

[ceph.git] / ceph / src / test / librgw_file_cd.cc

diff --git a/ceph/src/test/librgw_file_cd.cc b/ceph/src/test/librgw_file_cd.cc
index ff0bd1fbde2e71b1daa2c1544186120f401334be..e0f18022e10c7aeaa17ba577bdc52e665d1b51fe 100644 (file)
--- a/ceph/src/test/librgw_file_cd.cc
+++ b/ceph/src/test/librgw_file_cd.cc
@@ -25,6 +25,8 @@
 
 #define dout_subsys ceph_subsys_rgw
 
+using namespace std;
+
 namespace {
   librgw_t rgw = nullptr;
   string userid("testuser");
@@ -136,14 +138,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -153,6 +151,7 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {