import quincy beta 17.1.0

[ceph.git] / ceph / src / test / objectstore / chain_xattr.cc

diff --git a/ceph/src/test/objectstore/chain_xattr.cc b/ceph/src/test/objectstore/chain_xattr.cc
index 27c6bbb2f6d5322c2233e3b2eb856913e0d80707..a0db4e153d58f03d7dab9c41f19162db15d37449 100644 (file)
--- a/ceph/src/test/objectstore/chain_xattr.cc
+++ b/ceph/src/test/objectstore/chain_xattr.cc
@@ -32,6 +32,8 @@
 #define LARGE_BLOCK_LEN CHAIN_XATTR_MAX_BLOCK_LEN + 1024
 #define FILENAME "chain_xattr"
 
+using namespace std;
+
 TEST(chain_xattr, get_and_set) {
   const char* file = FILENAME;
   ::unlink(file);
@@ -435,10 +437,9 @@ TEST(chain_xattr, skip_chain_cleanup_and_ensure_single_attr)
 }
 
 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);