From: Willem Jan Withagen <wjw@digiware.nl>
Date: Thu, 24 Oct 2019 15:09:56 +0000 (+0200)
Subject: rgw: Select the std::bitset to resolv ambiguity
X-Git-Tag: v14.2.8~78^2~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32504%2Fhead;p=ceph.git

rgw: Select the std::bitset to resolv ambiguity

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit 2853a48385ce07689eac476ce7b0ff0057b1c195)
---

diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h
index cc6453acd9b0..65181087cf08 100644
--- a/src/rgw/rgw_iam_policy.h
+++ b/src/rgw/rgw_iam_policy.h
@@ -9,7 +9,6 @@
 #include <cstdint>
 #include <iostream>
 #include <string>
-#include <bitset>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
@@ -128,7 +127,7 @@ static constexpr std::uint64_t stsAll = 79;
 static constexpr std::uint64_t s3Count = s3BypassGovernanceRetention + 1;
 static constexpr std::uint64_t allCount = stsAll + 1;
 
-using Action_t = bitset<allCount>;
+using Action_t = std::bitset<allCount>;
 using NotAction_t = Action_t;
 
 static const Action_t None(0);