sha512sum/nameof_module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix assert and cast

Browse source
This commit is contained in:
terik23 2019-07-14 20:49:14 +05:00
parent c1a9e49d64
commit 241c6d9906
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/nameof.hpp
View file

@ -63,6 +63,16 @@ struct enum_range final {
static_assert(max > min, "nameof::enum_range requires max > min.");
};
static_assert(NAMEOF_ENUM_RANGE_MIN <= 0,
"NAMEOF_ENUM_RANGE_MIN must be less or equals than 0.");
static_assert(NAMEOF_ENUM_RANGE_MIN > (std::numeric_limits<int>::min)(),
"NAMEOF_ENUM_RANGE_MIN must be greater than INT_MIN.");
static_assert(NAMEOF_ENUM_RANGE_MAX > 0,
"NAMEOF_ENUM_RANGE_MAX must be greater than 0.");
static_assert(NAMEOF_ENUM_RANGE_MAX < (std::numeric_limits<int>::max)(),
"NAMEOF_ENUM_RANGE_MAX must be less than INT_MAX.");
namespace detail {
template <typename T>
@ -219,8 +229,8 @@ template <typename E>
constexpr auto range = std::make_integer_sequence<int, max - min + 1>{};
constexpr auto names = detail::enum_names_impl<D, min>(range);
if (int i = static_cast<int>(value) - min; i >= 0 && static_cast<std::size_t>(i) < names.size()) {
return names[static_cast<std::size_t>(i)];
if (auto i = static_cast<std::size_t>(static_cast<int>(value) - min); i < names.size()) {
return names[i];
} else {
return {}; // Value out of range.
}