diff --git a/.gitignore b/.gitignore index eb695eb..c57c218 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build/* +.clangd/* .vscode/* CMakeLists.txt.user diff --git a/headers/enum.hpp/enum_bitflags.hpp b/headers/enum.hpp/enum_bitflags.hpp index 5b021cb..32cc0c7 100644 --- a/headers/enum.hpp/enum_bitflags.hpp +++ b/headers/enum.hpp/enum_bitflags.hpp @@ -232,8 +232,7 @@ namespace enum_hpp::bitflags template < typename Enum > constexpr bool any_of(bitflags flags, bitflags mask) noexcept { - return mask.as_raw() == 0 - || (flags.as_raw() & mask.as_raw()) != 0; + return 0 != (flags.as_raw() & mask.as_raw()); } // @@ -258,8 +257,7 @@ namespace enum_hpp::bitflags template < typename Enum > constexpr bool none_of(bitflags flags, bitflags mask) noexcept { - return mask.as_raw() != 0 - && (flags.as_raw() & mask.as_raw()) == 0; + return 0 == (flags.as_raw() & mask.as_raw()); } // diff --git a/untests/enum_bitflags_tests.cpp b/untests/enum_bitflags_tests.cpp index 4dcf5e2..bd16868 100644 --- a/untests/enum_bitflags_tests.cpp +++ b/untests/enum_bitflags_tests.cpp @@ -337,44 +337,44 @@ TEST_CASE("enum_bitflags") { } SUBCASE("any_of") { - STATIC_CHECK(bf::any_of(access::none, access::none)); + STATIC_CHECK_FALSE(bf::any_of(access::none, access::none)); STATIC_CHECK_FALSE(bf::any_of(access::none, access::read)); STATIC_CHECK_FALSE(bf::any_of(access::none, access::write)); STATIC_CHECK_FALSE(bf::any_of(access::none, access::read_write)); - STATIC_CHECK(bf::any_of(access::read, access::none)); + STATIC_CHECK_FALSE(bf::any_of(access::read, access::none)); STATIC_CHECK(bf::any_of(access::read, access::read)); STATIC_CHECK_FALSE(bf::any_of(access::read, access::write)); STATIC_CHECK(bf::any_of(access::read, access::read_write)); - STATIC_CHECK(bf::any_of(access::write, access::none)); + STATIC_CHECK_FALSE(bf::any_of(access::write, access::none)); STATIC_CHECK_FALSE(bf::any_of(access::write, access::read)); STATIC_CHECK(bf::any_of(access::write, access::write)); STATIC_CHECK(bf::any_of(access::write, access::read_write)); - STATIC_CHECK(bf::any_of(access::read_write, access::none)); + STATIC_CHECK_FALSE(bf::any_of(access::read_write, access::none)); STATIC_CHECK(bf::any_of(access::read_write, access::read)); STATIC_CHECK(bf::any_of(access::read_write, access::write)); STATIC_CHECK(bf::any_of(access::read_write, access::read_write)); } SUBCASE("none_of") { - STATIC_CHECK_FALSE(bf::none_of(access::none, access::none)); + STATIC_CHECK(bf::none_of(access::none, access::none)); STATIC_CHECK(bf::none_of(access::none, access::read)); STATIC_CHECK(bf::none_of(access::none, access::write)); STATIC_CHECK(bf::none_of(access::none, access::read_write)); - STATIC_CHECK_FALSE(bf::none_of(access::read, access::none)); + STATIC_CHECK(bf::none_of(access::read, access::none)); STATIC_CHECK_FALSE(bf::none_of(access::read, access::read)); STATIC_CHECK(bf::none_of(access::read, access::write)); STATIC_CHECK_FALSE(bf::none_of(access::read, access::read_write)); - STATIC_CHECK_FALSE(bf::none_of(access::write, access::none)); + STATIC_CHECK(bf::none_of(access::write, access::none)); STATIC_CHECK(bf::none_of(access::write, access::read)); STATIC_CHECK_FALSE(bf::none_of(access::write, access::write)); STATIC_CHECK_FALSE(bf::none_of(access::write, access::read_write)); - STATIC_CHECK_FALSE(bf::none_of(access::read_write, access::none)); + STATIC_CHECK(bf::none_of(access::read_write, access::none)); STATIC_CHECK_FALSE(bf::none_of(access::read_write, access::read)); STATIC_CHECK_FALSE(bf::none_of(access::read_write, access::write)); STATIC_CHECK_FALSE(bf::none_of(access::read_write, access::read_write));