X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Flexicalcast.cpp;h=5e9159ce97af5e42db1ad9ba63ee1669a21c2a93;hp=2fc4be35c182f2d3dde801212580b2329df7a4b1;hb=HEAD;hpb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index 2fc4be3..5e9159c 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; } };
 
@@ -119,7 +123,7 @@ T str_to_int(const string &s, const Fmt &f)
 	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;
 }
@@ -526,13 +530,11 @@ void operator<<(LexicalConverter &c, unsigned v)
 void operator<<(LexicalConverter &c, unsigned long v)
 { c.result(int_to_str(v, c.get_fmt())); }
 
-#ifdef __GNUC__
 void operator<<(LexicalConverter &c, long long v)
 { c.result(int_to_str(v, c.get_fmt())); }
 
 void operator<<(LexicalConverter &c, unsigned long long v)
 { c.result(int_to_str(v, c.get_fmt())); }
-#endif
 
 void operator<<(LexicalConverter &c, bool v)
 { c.result(bool_to_str(v, c.get_fmt())); }
@@ -553,7 +555,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>> ***/
@@ -597,13 +599,11 @@ void operator>>(const LexicalConverter &c, unsigned int &v)
 void operator>>(const LexicalConverter &c, unsigned long &v)
 { v = str_to_int<unsigned long>(c.get(), c.get_fmt()); }
 
-#ifdef __GNUC__
 void operator>>(const LexicalConverter &c, long long &v)
 { v = str_to_int<long long>(c.get(), c.get_fmt()); }
 
 void operator>>(const LexicalConverter &c, unsigned long long &v)
 { v = str_to_int<unsigned long long>(c.get(), c.get_fmt()); }
-#endif
 
 void operator>>(const LexicalConverter &c, bool &v)
 { v = str_to_bool(c.get()); }