0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Lexical Cast: remove use of boost::mpl"

Browse source 
This reverts commit 88299f13869a8c32d859ec314356db6cb7e204a6.

(cherry-picked from commit 56e7b01ac4)
This commit is contained in:
josteph 2018-10-02 22:44:51 +00:00 • committed by Iris Morelle
parent c35ab93ff5
commit 0228706f31
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lexical_cast.hpp
View file

@ -53,6 +53,7 @@
#include <sstream>
#include <type_traits>
#include <boost/mpl/set.hpp>
#include <boost/optional.hpp>
#define DEBUG_THROW(id)
@ -193,7 +194,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<boost::mpl::has_key<boost::mpl::set<char*, const char*> , From>::value>
>
{
long long operator()(From value, boost::optional<long long> fallback) const
@ -249,7 +250,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<boost::mpl::has_key<boost::mpl::set<char*, const char*> , From>::value>
>
{
To operator()(From value, boost::optional<To> fallback) const
@ -307,7 +308,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<boost::mpl::has_key<boost::mpl::set<char*, const char*> , From>::value>
>
{
To operator()(From value, boost::optional<To> fallback) const
@ -376,7 +377,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<boost::mpl::has_key<boost::mpl::set<char*, const char*> , From>::value>
>
{
unsigned long long operator()(From value, boost::optional<unsigned long long> fallback) const
@ -433,7 +434,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<boost::mpl::has_key<boost::mpl::set<char*, const char*> , From>::value>
>
{
To operator()(From value, boost::optional<To> fallback) const