X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Flexicalcast.cpp;h=2b84d9bbbcdaa4e93af36d15d6bb5063807f7ef6;hp=8789544bbb355f14f421ccd9a6ea5f761a25e256;hb=b116e161e377da0e4e52f07745ecb2d22f962ae9;hpb=20c897ece781e18ba54c41fd68e232ce566a938d

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index 8789544..2b84d9b 100644
--- a/source/strings/lexicalcast.cpp
+++ b/source/strings/lexicalcast.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
+#include <cstdint>
 #include <limits>
-#include <msp/core/inttypes.h>
 #include "format.h"
 #include "lexicalcast.h"
 
@@ -10,12 +10,8 @@ namespace {
 
 using namespace Msp;
 
-template<typename T>
-struct IsSigned
-{ enum { result = !(static_cast<T>(-1)>0) }; };
-
 /* Helper to avoid warnings about an unsigned type never being < 0 */
-template<typename T, bool f = IsSigned<T>::result>
+template<typename T, bool f = is_signed<T>::value>
 struct IsNegative
 { static bool eval(T v) { return v<0; } };
 
@@ -23,9 +19,17 @@ template<typename T>
 struct IsNegative<T, false>
 { static bool eval(T) { return false; } };
 
+template<typename T, bool f = is_signed<T>::value>
+struct Negate
+{ static T eval(T v) { return -v; } };
+
+template<typename T>
+struct Negate<T, false>
+{ static T eval(T v) { return (~v)+1; } };
+
 /* Helper to avoid errors about ambiguous function calls since there are no
 overloads of abs for unsigned types */
-template<typename T, bool f = IsSigned<T>::result>
+template<typename T, bool f = is_signed<T>::value>
 struct Absolute
 { static T eval(T v) { return v<0 ? -v : v; } };
 
@@ -59,7 +63,7 @@ char *int_to_str(T v, const Fmt &f, char *end)
 	const char *digits = (f.get_uppercase() ? udigits : ldigits);
 	if(v)
 	{
-		typename MatchingInt<T>::UnsignedType w = Absolute<T>::eval(v);
+		typename std::make_unsigned<T>::type w = Absolute<T>::eval(v);
 		while(w)
 		{
 			*--ptr = digits[w%base];
@@ -113,13 +117,13 @@ T str_to_int(const string &s, const Fmt &f)
 	if(s.empty())
 		throw lexical_error("conversion of '' to integer");
 
-	string::const_iterator i = s.begin();
+	auto i = s.begin();
 
 	// See if the input starts with a sign
 	bool neg = false;
 	if(*i=='-')
 	{
-		if(!IsSigned<T>::result)
+		if(is_unsigned<T>::value)
 			throw lexical_error(format("conversion of '%s' to unsigned integer", s));
 		neg = true;
 		++i;
@@ -174,7 +178,7 @@ T str_to_int(const string &s, const Fmt &f)
 	}
 
 	if(neg)
-		result = -result;
+		result = Negate<T>::eval(result);
 
 	return result;
 }
@@ -389,7 +393,7 @@ T str_to_flt(const string &s, const Fmt &)
 	if(s.empty())
 		throw lexical_error("conversion of '' to floating-point");
 
-	string::const_iterator i = s.begin();
+	auto i = s.begin();
 
 	// See if the input starts with a sign
 	bool neg = false;
@@ -553,7 +557,7 @@ void operator<<(LexicalConverter &c, const char *s)
 { c.result(str_to_str(s, c.get_fmt())); }
 
 void operator<<(LexicalConverter &c, const void *p)
-{ c.result(int_to_str(reinterpret_cast<IntPtr>(p), c.get_fmt())); }
+{ c.result(int_to_str(reinterpret_cast<intptr_t>(p), c.get_fmt())); }
 
 
 /*** operator>> ***/