import quincy beta 17.1.0

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

diff --git a/ceph/src/test/TestTimers.cc b/ceph/src/test/TestTimers.cc
index eaa78f82b6ba82681675bb5b8310bed88a86ac47..78bdfd3a41bde15cbc98de564fb2646e27814fdb 100644 (file)
--- a/ceph/src/test/TestTimers.cc
+++ b/ceph/src/test/TestTimers.cc
@@ -13,6 +13,8 @@
  */
 #define MAX_TEST_CONTEXTS 5
 
+using namespace std;
+
 class TestContext;
 
 namespace
@@ -244,10 +246,9 @@ static int safe_timer_cancellation_test(SafeTimer &safe_timer,
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, 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);