remove union type, simplify
This commit is contained in:
parent
f2522c2cc0
commit
0b9cbf7dd2
1 changed files with 2 additions and 11 deletions
|
@ -986,16 +986,7 @@ template <typename From, typename Type>
|
||||||
From get_base_type(Type From::*);
|
From get_base_type(Type From::*);
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
union union_type {
|
extern T nonexist_object;
|
||||||
constexpr ~union_type() {}
|
|
||||||
char c = {};
|
|
||||||
T f;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct union_type_holder {
|
|
||||||
constexpr static union_type<T> value;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <auto V>
|
template <auto V>
|
||||||
constexpr auto get_member_name() noexcept {
|
constexpr auto get_member_name() noexcept {
|
||||||
|
@ -1005,7 +996,7 @@ constexpr auto get_member_name() noexcept {
|
||||||
constexpr bool is_defined = sizeof(decltype(get_base_type(V))) != 0;
|
constexpr bool is_defined = sizeof(decltype(get_base_type(V))) != 0;
|
||||||
static_assert(is_defined, "nameof::nameof_member member name can use only if the struct is already fully defined. Please use NAMEOF macro, or separate definition and declaration.");
|
static_assert(is_defined, "nameof::nameof_member member name can use only if the struct is already fully defined. Please use NAMEOF macro, or separate definition and declaration.");
|
||||||
if constexpr (is_defined) {
|
if constexpr (is_defined) {
|
||||||
return n<V, &(union_type_holder<decltype(get_base_type(V))>::value.f.*V)>();
|
return n<V, &(nonexist_object.*V)>();
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue