import quincy beta 17.1.0

[ceph.git] / ceph / src / test / filestore / TestFileStore.cc

diff --git a/ceph/src/test/filestore/TestFileStore.cc b/ceph/src/test/filestore/TestFileStore.cc
index 88ec02f484e9a8086ecd3cffe581c3966ad72e10..02bc549e108437bfe2a81b21b7462efcd8c0979c 100644 (file)
--- a/ceph/src/test/filestore/TestFileStore.cc
+++ b/ceph/src/test/filestore/TestFileStore.cc
@@ -19,6 +19,8 @@
 #include "os/filestore/FileStore.h"
 #include <gtest/gtest.h>
 
+using namespace std;
+
 class TestFileStore {
 public:
   static void create_backend(FileStore &fs, unsigned long f_type) {
@@ -65,10 +67,9 @@ TEST(FileStore, create)
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);