Well this feels a bit hacky

wesnoth · Dec 1, 2020 · 37ea96e · 37ea96e
1 parent ffeb062
commit 37ea96e
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/lexical_cast.hpp b/src/lexical_cast.hpp
@@ -121,6 +121,9 @@ struct bad_lexical_cast : std::exception
 
 namespace implementation {
 
+template<typename From>
+using constless_ptr_t = std::add_pointer_t<std::remove_const_t<std::remove_pointer_t<From>>>;
+
 /**
  * Base class for the conversion.
  *
@@ -193,7 +196,7 @@ struct lexical_caster<
 	  long long
 	, From
 	, void
-	, std::enable_if_t<std::is_same<std::remove_const_t<std::remove_pointer_t<From>>, char>::value>
+	, std::enable_if_t<std::is_same<constless_ptr_t<From>, char*>::value>
 	>
 {
 	long long operator()(From value, boost::optional<long long> fallback) const
@@ -249,7 +252,7 @@ struct lexical_caster<
 	  To
 	, From
 	, std::enable_if_t<std::is_integral<To>::value && std::is_signed<To>::value && !std::is_same<To, long long>::value>
-	, std::enable_if_t<std::is_same<std::remove_const_t<std::remove_pointer_t<From>>, char>::value>
+	, std::enable_if_t<std::is_same<constless_ptr_t<From>, char*>::value>
 	>
 {
 	To operator()(From value, boost::optional<To> fallback) const
@@ -307,7 +310,7 @@ struct lexical_caster<
 	  To
 	, From
 	, std::enable_if_t<std::is_floating_point<To>::value>
-	, std::enable_if_t<std::is_same<std::remove_const_t<std::remove_pointer_t<From>>, char>::value>
+	, std::enable_if_t<std::is_same<constless_ptr_t<From>, char*>::value>
 	>
 {
 	To operator()(From value, boost::optional<To> fallback) const
@@ -376,7 +379,7 @@ struct lexical_caster<
 	  unsigned long long
 	, From
 	, void
-	, std::enable_if_t<std::is_same<std::remove_const_t<std::remove_pointer_t<From>>, char>::value>
+	, std::enable_if_t<std::is_same<constless_ptr_t<From>, char*>::value>
 	>
 {
 	unsigned long long operator()(From value, boost::optional<unsigned long long> fallback) const
@@ -433,7 +436,7 @@ struct lexical_caster<
 	  To
 	, From
 	, std::enable_if_t<std::is_unsigned<To>::value && !std::is_same<To, unsigned long long>::value>
-	, std::enable_if_t<std::is_same<std::remove_const_t<std::remove_pointer_t<From>>, char>::value>
+	, std::enable_if_t<std::is_same<constless_ptr_t<From>, char*>::value>
 	>
 {
 	To operator()(From value, boost::optional<To> fallback) const