Fix lexical_cast compiler errors on MSVC 2013

wesnoth · Dec 7, 2016 · e6cae2e · e6cae2e
1 parent 89d38ac
commit e6cae2e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lexical_cast.hpp b/src/lexical_cast.hpp
@@ -226,7 +226,7 @@ template <class To, class From>
 struct lexical_caster<
 	  To
 	, From
-	, typename std::enable_if<std::is_signed<To>::value >::type
+	, typename std::enable_if<std::is_signed<To>::value && !std::is_same<To, long long>::value >::type
 	, typename std::enable_if<boost::mpl::has_key<boost::mpl::set<
 			char*, const char*> , From>::value >::type
 	>
@@ -332,7 +332,7 @@ template <class To, class From>
 struct lexical_caster<
 	  To
 	, From
-	, typename std::enable_if<std::is_unsigned<To>::value >::type
+	, typename std::enable_if<std::is_unsigned<To>::value && !std::is_same<To, unsigned long long>::value >::type
 	, typename std::enable_if<boost::mpl::has_key<boost::mpl::set<
 			char*, const char*> , From>::value >::type
 	>