import quincy beta 17.1.0

[ceph.git] / ceph / src / tools / rbd / Shell.cc

diff --git a/ceph/src/tools/rbd/Shell.cc b/ceph/src/tools/rbd/Shell.cc
index b3d33e9c81f6f151c82d4e979c209b4304dd038f..c7d07657403b128923ba89244db627b1dd9bd391 100644 (file)
--- a/ceph/src/tools/rbd/Shell.cc
+++ b/ceph/src/tools/rbd/Shell.cc
@@ -28,8 +28,7 @@ static const std::string BASH_COMPLETION_SPEC("bash-completion");
 boost::intrusive_ptr<CephContext> global_init(
     int argc, const char **argv, std::vector<std::string> *command_args,
     std::vector<std::string> *global_init_args) {
-  std::vector<const char*> cmd_args;
-  argv_to_vec(argc, argv, cmd_args);
+  auto cmd_args = argv_to_vec(argc, argv);
   std::vector<const char*> args(cmd_args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,
@@ -221,7 +220,7 @@ int Shell::execute(int argc, const char **argv) {
           if (!result.empty()) {
             print_deprecated_warning(option, description);
           }
-        } catch (exception& e) {
+        } catch (std::exception& e) {
           continue;
         }
       }