From 2853a48385ce07689eac476ce7b0ff0057b1c195 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Thu, 24 Oct 2019 17:09:56 +0200 Subject: [PATCH] rgw: Select the std::bitset to resolv ambiguity Signed-off-by: Willem Jan Withagen --- src/rgw/rgw_iam_policy.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h index f6269dbef6a..00048b4a7af 100644 --- a/src/rgw/rgw_iam_policy.h +++ b/src/rgw/rgw_iam_policy.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include @@ -125,7 +124,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; +using Action_t = std::bitset; using NotAction_t = Action_t; static const Action_t None(0); -- 2.39.5