coffee/better-enums
1
0
Fork 0
mirror of https://github.com/aantron/better-enums.git synced 2025-12-06 16:56:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed _from_index_loop and moved its functionality to _from_index_nothrow

Browse Source
This commit is contained in:
Piotr Kosek 2018-09-01 12:41:17 +02:00
parent f044492ae8
commit 8e2bc1d876
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
enum.h
View File

@ -675,8 +675,6 @@ class Enum { \
\ \
BETTER_ENUMS_CONSTEXPR_ static _optional_index \ BETTER_ENUMS_CONSTEXPR_ static _optional_index \
_from_value_loop(_integral value, std::size_t index = 0); \ _from_value_loop(_integral value, std::size_t index = 0); \
BETTER_ENUMS_CONSTEXPR_ static _optional \
_from_index_loop(std::size_t index); \
BETTER_ENUMS_CONSTEXPR_ static _optional_index \ BETTER_ENUMS_CONSTEXPR_ static _optional_index \
_from_string_loop(const char *name, std::size_t index = 0); \ _from_string_loop(const char *name, std::size_t index = 0); \
BETTER_ENUMS_CONSTEXPR_ static _optional_index \ BETTER_ENUMS_CONSTEXPR_ static _optional_index \
@ -717,15 +715,6 @@ Enum::_from_value_loop(Enum::_integral value, std::size_t index) \
_from_value_loop(value, index + 1); \ _from_value_loop(value, index + 1); \
} \ } \
\ \
BETTER_ENUMS_CONSTEXPR_ inline Enum::_optional \
Enum::_from_index_loop(std::size_t index) \
{ \
return \
index >= _size() ? \
_optional() : \
_optional(BETTER_ENUMS_NS(Enum)::_value_array[index]); \
} \
\
BETTER_ENUMS_CONSTEXPR_ inline Enum::_optional_index \ BETTER_ENUMS_CONSTEXPR_ inline Enum::_optional_index \
Enum::_from_string_loop(const char *name, std::size_t index) \ Enum::_from_string_loop(const char *name, std::size_t index) \
{ \ { \
@ -768,7 +757,10 @@ Enum::_from_index_unchecked(std::size_t index) \
BETTER_ENUMS_CONSTEXPR_ inline Enum::_optional \ BETTER_ENUMS_CONSTEXPR_ inline Enum::_optional \
Enum::_from_index_nothrow(std::size_t index) \ Enum::_from_index_nothrow(std::size_t index) \
{ \ { \
return _from_index_loop(index); \ return \
index >= _size() ? \
_optional() : \
_optional(BETTER_ENUMS_NS(Enum)::_value_array[index]); \
} \ } \
\ \
BETTER_ENUMS_IF_EXCEPTIONS( \ BETTER_ENUMS_IF_EXCEPTIONS( \