From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Jul 2017 19:44:59 +0000 (-0400)
Subject: mon/MonCommands: std::
X-Git-Tag: v12.1.2~196^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8badb73b9a49fce5c1e5f77a85545f26644e2079;p=ceph.git

mon/MonCommands: std::

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MonCommand.h b/src/mon/MonCommand.h
index 94716d6c9e92..e32cc5df2be2 100644
--- a/src/mon/MonCommand.h
+++ b/src/mon/MonCommand.h
@@ -13,12 +13,15 @@
 
 #pragma once
 
+#include <string>
+#include "include/encoding.h"
+
 struct MonCommand {
-  string cmdstring;
-  string helpstring;
-  string module;
-  string req_perms;
-  string availability;
+  std::string cmdstring;
+  std::string helpstring;
+  std::string module;
+  std::string req_perms;
+  std::string availability;
   uint64_t flags;
 
   // MonCommand flags
@@ -118,7 +121,7 @@ struct MonCommand {
   }
 
   bool requires_perm(char p) const {
-    return (req_perms.find(p) != string::npos); 
+    return (req_perms.find(p) != std::string::npos);
   }
 };
 WRITE_CLASS_ENCODER(MonCommand)