import quincy beta 17.1.0

[ceph.git] / ceph / src / mon / MonCap.h

diff --git a/ceph/src/mon/MonCap.h b/ceph/src/mon/MonCap.h
index ab4e35bc90ce7cb704d590246821953dc4105d64..570f788ad590e1b604d1bd80667baf5b58483607 100644 (file)
--- a/ceph/src/mon/MonCap.h
+++ b/ceph/src/mon/MonCap.h
@@ -183,8 +183,8 @@ struct MonCap {
   void dump(ceph::Formatter *f) const;
   static void generate_test_instances(std::list<MonCap*>& ls);
 
-  std::vector<string> allowed_fs_names() const {
-    std::vector<string> ret;
+  std::vector<std::string> allowed_fs_names() const {
+    std::vector<std::string> ret;
     for (auto& g : grants) {
       if (not g.fs_name.empty()) {
        ret.push_back(g.fs_name);
@@ -195,7 +195,7 @@ struct MonCap {
     return ret;
   }
 
-  bool fs_name_capable(const EntityName& ename, string_view fs_name,
+  bool fs_name_capable(const EntityName& ename, std::string_view fs_name,
                       __u8 mask) {
     for (auto& g : grants) {
       if (g.is_allow_all()) {