upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 15:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup c57a175fee701b4d19c09653a5c9445b778d139e

Browse Source 
Turns out remove_const alone only removes the const from the pointer, not from the type
itself, so the expression wasn't returning true. This strips the pointer out before removing
const and matches against char instead of char*

(cherry-picked from commit a7e1ff85ed10fa56512583648727155a54a2b0cd)
This commit is contained in:
Charles Dang 2018-04-18 10:35:26 +11:00
parent 872d1a9003
commit 1a41e8f7f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lexical_cast.hpp
View File

@ -193,7 +193,7 @@ struct lexical_caster<
long long
, From
, void
, std::enable_if_t<std::is_same<char*, std::remove_const_t<From>>::value>
, std::enable_if_t<std::is_same<char, std::remove_const_t<std::remove_pointer_t<From>>>::value>
>
{
long long operator()(From value, boost::optional<long long> fallback) const
@ -249,7 +249,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<char*, std::remove_const_t<From>>::value>
, std::enable_if_t<std::is_same<char, std::remove_const_t<std::remove_pointer_t<From>>>::value>
>
{
To operator()(From value, boost::optional<To> fallback) const
@ -307,7 +307,7 @@ struct lexical_caster<
To
, From
, std::enable_if_t<std::is_floating_point<To>::value>
, std::enable_if_t<std::is_same<char*, std::remove_const_t<From>>::value>
, std::enable_if_t<std::is_same<char, std::remove_const_t<std::remove_pointer_t<From>>>::value>
>
{
To operator()(From value, boost::optional<To> fallback) const
@ -376,7 +376,7 @@ struct lexical_caster<
unsigned long long
, From
, void
, std::enable_if_t<std::is_same<char*, std::remove_const_t<From>>::value>
, std::enable_if_t<std::is_same<char, std::remove_const_t<std::remove_pointer_t<From>>>::value>
>
{
unsigned long long operator()(From value, boost::optional<unsigned long long> fallback) const
@ -433,7 +433,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<char*, std::remove_const_t<From>>::value>
, std::enable_if_t<std::is_same<char, std::remove_const_t<std::remove_pointer_t<From>>>::value>
>
{
To operator()(From value, boost::optional<To> fallback) const