register traits in enum namespace

This commit is contained in:
BlackMATov
2020-04-20 11:49:21 +07:00
parent fc01416c45
commit 9d80365d22
4 changed files with 17 additions and 21 deletions

View File

@@ -142,10 +142,10 @@ namespace some_namespace
(green = 0x00FF00) (green = 0x00FF00)
(blue = 0x0000FF) (blue = 0x0000FF)
(white = red | green | blue)) (white = red | green | blue))
}
// register traits in global namespace to generic access // register traits in enum namespace to generic access
ENUM_HPP_REGISTER_TRAITS(some_namespace::color) ENUM_HPP_REGISTER_TRAITS(color)
}
int main() { int main() {
using color = some_namespace::color; using color = some_namespace::color;
@@ -176,9 +176,9 @@ namespace external_ns
(a) (a)
(b) (b)
(c)) (c))
}
ENUM_HPP_REGISTER_TRAITS(external_ns::external_enum) ENUM_HPP_REGISTER_TRAITS(external_enum)
}
int main() { int main() {
using ee = external_ns::external_enum; using ee = external_ns::external_enum;
@@ -245,7 +245,7 @@ struct /*enum_name*/_traits {
### Generic functions ### Generic functions
```cpp ```cpp
// should be in global namespace // should be in enum namespace
ENUM_HPP_REGISTER_TRAITS(/*declared_enum_name*/) ENUM_HPP_REGISTER_TRAITS(/*declared_enum_name*/)
namespace enum_hpp namespace enum_hpp

View File

@@ -7,6 +7,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <utility>
#include <optional> #include <optional>
#include <stdexcept> #include <stdexcept>
#include <string_view> #include <string_view>
@@ -27,10 +28,7 @@ namespace enum_hpp
namespace enum_hpp namespace enum_hpp
{ {
template < typename Enum > template < typename Enum >
struct traits; using traits_t = decltype(enum_hpp_adl_find_registered_traits(std::declval<Enum>()));
template < typename Enum >
using traits_t = typename traits<Enum>::type;
template < typename Enum > template < typename Enum >
using underlying_type = typename traits_t<Enum>::underlying_type; using underlying_type = typename traits_t<Enum>::underlying_type;
@@ -335,10 +333,7 @@ namespace enum_hpp::detail
// //
#define ENUM_HPP_REGISTER_TRAITS(Enum)\ #define ENUM_HPP_REGISTER_TRAITS(Enum)\
template <>\ [[maybe_unused]] Enum##_traits enum_hpp_adl_find_registered_traits(Enum) noexcept;
struct enum_hpp::traits<Enum> {\
using type = Enum##_traits;\
};
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// //

View File

@@ -19,9 +19,9 @@ namespace
(green = 0x00FF00) (green = 0x00FF00)
(blue = 0x0000FF) (blue = 0x0000FF)
(white = red | green | blue)) (white = red | green | blue))
}
ENUM_HPP_REGISTER_TRAITS(color) ENUM_HPP_REGISTER_TRAITS(color)
}
TEST_CASE("examples") { TEST_CASE("examples") {
SECTION("traits_using") { SECTION("traits_using") {

View File

@@ -55,6 +55,10 @@ namespace some_namespace
(_221)(_222)(_223)(_224)(_225)(_226)(_227)(_228)(_229)(_230)(_231)(_232)(_233)(_234)(_235)(_236)(_237)(_238)(_239)(_240) (_221)(_222)(_223)(_224)(_225)(_226)(_227)(_228)(_229)(_230)(_231)(_232)(_233)(_234)(_235)(_236)(_237)(_238)(_239)(_240)
(_241)(_242)(_243)(_244)(_245)(_246)(_247)(_248)(_249)(_250)(_251)(_252)(_253)(_254)(_255)) (_241)(_242)(_243)(_244)(_245)(_246)(_247)(_248)(_249)(_250)(_251)(_252)(_253)(_254)(_255))
ENUM_HPP_REGISTER_TRAITS(some_namespace::color)
ENUM_HPP_REGISTER_TRAITS(some_namespace::numbers)
ENUM_HPP_REGISTER_TRAITS(some_namespace::render::mask)
namespace exns namespace exns
{ {
enum class external_enum : unsigned short { enum class external_enum : unsigned short {
@@ -67,14 +71,11 @@ namespace some_namespace
(a) (a)
(b) (b)
(c)) (c))
ENUM_HPP_REGISTER_TRAITS(external_enum)
} }
} }
ENUM_HPP_REGISTER_TRAITS(some_namespace::color)
ENUM_HPP_REGISTER_TRAITS(some_namespace::numbers)
ENUM_HPP_REGISTER_TRAITS(some_namespace::render::mask)
ENUM_HPP_REGISTER_TRAITS(some_namespace::exns::external_enum)
TEST_CASE("enum") { TEST_CASE("enum") {
namespace sn = some_namespace; namespace sn = some_namespace;