X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Flexicalcast.cpp;h=2b84d9bbbcdaa4e93af36d15d6bb5063807f7ef6;hp=2c867b2ce0572b7489a7fb6c9e74013efb6b7804;hb=HEAD;hpb=062b200b08ec5998c4c02326e1e7b4e71fe4a5c6

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index 2c867b2..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"
 
@@ -530,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())); }
@@ -557,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>> ***/
@@ -601,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()); }