From 241c6d9906416c9f6af1594ddb296d11b40bb865 Mon Sep 17 00:00:00 2001
From: terik23 <neargye@gmail.com>
Date: Sun, 14 Jul 2019 20:49:14 +0500
Subject: [PATCH] fix assert and cast

---
 include/nameof.hpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/nameof.hpp b/include/nameof.hpp
index 223bb03..c847b2b 100644
--- a/include/nameof.hpp
+++ b/include/nameof.hpp
@@ -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.
   }