import quincy beta 17.1.0

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

diff --git a/ceph/src/test/librgw_file_gp.cc b/ceph/src/test/librgw_file_gp.cc
index bde68fb4b9e24a0a204b2d07801f8781393f16de..56b61dce4be8e2ea1c4fd80728741b713f85b1b8 100644 (file)
--- a/ceph/src/test/librgw_file_gp.cc
+++ b/ceph/src/test/librgw_file_gp.cc
@@ -30,6 +30,8 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rgw
 
+using namespace std;
+
 namespace {
   librgw_t rgw = nullptr;
   string uid("testuser");
@@ -437,14 +439,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;
   }
@@ -454,6 +452,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)) {