Use the standard fixed-size integer types directly

[libs/core.git] / source / strings / lexicalcast.cpp

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index 1c1f72010cc49c6b55c9013b4fc5bd4fbd662d75..2b84d9bbbcdaa4e93af36d15d6bb5063807f7ef6 100644 (file)
--- 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"
 
@@ -19,6 +19,14 @@ 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 = is_signed<T>::value>
@@ -170,7 +178,7 @@ T str_to_int(const string &s, const Fmt &f)
        }
 
        if(neg)
-               result = -result;
+               result = Negate<T>::eval(result);
 
        return result;
 }
@@ -549,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>> ***/