]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: Select the std::bitset to resolv ambiguity
authorWillem Jan Withagen <wjw@digiware.nl>
Thu, 24 Oct 2019 15:09:56 +0000 (17:09 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Thu, 24 Oct 2019 15:09:56 +0000 (17:09 +0200)
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/rgw/rgw_iam_policy.h

index f6269dbef6ac1c72ec3bd19c24bb12edd1047687..00048b4a7af0437b84131724a69d488567bcf4ac 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>
@@ -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<allCount>;
+using Action_t = std::bitset<allCount>;
 using NotAction_t = Action_t;
 
 static const Action_t None(0);