Improve character comparisons.

HaxyM · Aug 21, 2024 · 7abc2a9 · 7abc2a9
1 parent 069d95c
commit 7abc2a9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/include/crap/locale.d/isuppervalue.h b/include/crap/locale.d/isuppervalue.h
@@ -1,16 +1,20 @@
 #ifndef CRAP_LOCALE_ISUPPERVALUE
 #define CRAP_LOCALE_ISUPPERVALUE
 
-#include "locale.h"
-
+#include <cstdint>
 #include <type_traits>
 
+#include "locale.h"
+#include "../utility.d/cmpgreaterequalvalue.h"
+#include "../utility.d/cmplessequalvalue.h"
+
 namespace crap
 {
  template <class CharType, CharType, locale = locale :: C> struct isupperValue;
 
  template <class CharType, CharType Char> struct isupperValue<CharType, Char, locale :: C>
-	 : std :: integral_constant<bool, (Char >= static_cast<CharType>(65)) && (Char <= static_cast<CharType>(90))>
+	 : std :: integral_constant<bool, (cmpGreaterEqualValue <CharType, Char, std :: uint32_t, UINT32_C(65)> :: value)
+	 && (cmpLessEqualValue <CharType, Char, std :: uint32_t, UINT32_C(90)> :: value)>
 	 {};
 }
 #endif