From: Rishabh Dave <ridave@redhat.com>
Date: Sat, 24 Jun 2023 04:15:03 +0000 (+0530)
Subject: MDSAuthCaps: use string and vector directly
X-Git-Tag: testing/wip-pdonnell-testing-20240430.123648-reef-debug~93^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8285a9fd77e51e5e3258232b688e47ec27fb7377;p=ceph-ci.git

MDSAuthCaps: use string and vector directly

Since std::string and std::vector are brought into the current namespace
at the beginning of MDSAuthCaps.cc, write "string" and "vector" instead
of "std::string" and "std::vector" respectively.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 34f2243b8c89ed13760eb55994bef5f1a679ab24)

Conflicts:
	src/mds/MDSAuthCaps.cc: some code using string/vector was
	deleted by a different Reef backport due to which some patches
	from this commit weren't applicable.
---

diff --git a/src/mds/MDSAuthCaps.cc b/src/mds/MDSAuthCaps.cc
index 7f16c954368..e4287072475 100644
--- a/src/mds/MDSAuthCaps.cc
+++ b/src/mds/MDSAuthCaps.cc
@@ -113,11 +113,11 @@ struct MDSCapParser : qi::grammar<Iterator, MDSAuthCaps()>
   qi::rule<Iterator, bool()> root_squash;
   qi::rule<Iterator, MDSCapSpec()> capspec;
   qi::rule<Iterator, uint32_t()> uid;
-  qi::rule<Iterator, std::vector<uint32_t>() > uintlist;
-  qi::rule<Iterator, std::vector<uint32_t>() > gidlist;
+  qi::rule<Iterator, vector<uint32_t>() > uintlist;
+  qi::rule<Iterator, vector<uint32_t>() > gidlist;
   qi::rule<Iterator, MDSCapMatch()> match;
   qi::rule<Iterator, MDSCapGrant()> grant;
-  qi::rule<Iterator, std::vector<MDSCapGrant>()> grants;
+  qi::rule<Iterator, vector<MDSCapGrant>()> grants;
   qi::rule<Iterator, MDSAuthCaps()> mdscaps;
 };
 
@@ -356,7 +356,7 @@ bool MDSAuthCaps::parse(string_view str, ostream *err)
 
     if (err)
       *err << "mds capability parse failed, stopped at '"
-	   << std::string(iter, end)
+	   << string(iter, end)
            << "' of '" << str << "'";
     return false; 
   }