]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Select the std::bitset to resolv ambiguity 32504/head
authorWillem Jan Withagen <wjw@digiware.nl>
Thu, 24 Oct 2019 15:09:56 +0000 (17:09 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 24 Jan 2020 15:43:38 +0000 (16:43 +0100)
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit 2853a48385ce07689eac476ce7b0ff0057b1c195)

src/rgw/rgw_iam_policy.h

index cc6453acd9b0a752f56fa5c0373c245685b8fe13..65181087cf089002b7b9634a7503da85d1784f79 100644 (file)
@@ -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);