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

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index 8789544..2fc4be3 100644
--- a/source/strings/lexicalcast.cpp
+++ b/source/strings/lexicalcast.cpp
@@ -59,7 +59,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,7 +113,7 @@ 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;
@@ -389,7 +389,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;