coffee/better-enums
1
0
Fork 0
mirror of https://github.com/aantron/better-enums.git synced 2025-12-07 17:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed not compiling code

Browse Source
This commit is contained in:
Piotr Kosek 2018-08-31 17:07:33 +02:00
parent 646632e43a
commit 93ceb8a37d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
enum.h
View File

@ -346,7 +346,7 @@ BETTER_ENUMS_CONSTEXPR_ static T* _or_null(optional<T*> maybe)
template <typename T>
BETTER_ENUMS_CONSTEXPR_ static T _or_zero(optional<T> maybe)
{
return maybe ? *maybe : static_cast<T>(0);
return maybe ? *maybe : T::_from_integral_unchecked(0);
}
@ -675,7 +675,7 @@ class Enum { \
\
BETTER_ENUMS_CONSTEXPR_ static _optional_index \
_from_value_loop(_integral value, std::size_t index = 0); \
BETTER_ENUMS_CONSTEXPR_ static _optional_index \
BETTER_ENUMS_CONSTEXPR_ static _optional \
_from_index_loop(_integral value, std::size_t index = 0); \
BETTER_ENUMS_CONSTEXPR_ static _optional_index \
_from_string_loop(const char *name, std::size_t index = 0); \
@ -721,11 +721,9 @@ BETTER_ENUMS_CONSTEXPR_ inline Enum::_optional \
Enum::_from_index_loop(Enum::_integral value, std::size_t index) \
{ \
return \
index == _size() ? \
index >= _size() ? \
_optional() : \
BETTER_ENUMS_NS(Enum)::index == value ? \
_optional(_value_array[index]) : \
_from_value_loop(value, index + 1); \
_optional(BETTER_ENUMS_NS(Enum)::_value_array[index]); \
} \
\
BETTER_ENUMS_CONSTEXPR_ inline Enum::_optional_index \
@ -757,7 +755,7 @@ BETTER_ENUMS_CONSTEXPR_ inline Enum::_integral Enum::_to_integral() const \
\
BETTER_ENUMS_CONSTEXPR_ inline Enum::_integral Enum::_to_index() const \
{ \
return _from_value_loop(value) \
return *_from_value_loop(_value); \
} \
\
BETTER_ENUMS_CONSTEXPR_ inline Enum \