From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 20 Sep 2009 16:16:36 +0000 (+0000)
Subject: Fix compile erorrs on 64-bit systems
X-Git-Tag: strings-1.1~2
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=9573cffd8df40a81cd7c338d63d07e4965eb3854;p=libs%2Fcore.git

Fix compile erorrs on 64-bit systems
---

diff --git a/source/lexicalcast.cpp b/source/lexicalcast.cpp
index 9ba642f..a1270d6 100644
--- a/source/lexicalcast.cpp
+++ b/source/lexicalcast.cpp
@@ -119,7 +119,7 @@ char *int_to_str(T v, const Fmt &f, char *end)
 template<typename T>
 string int_to_str(T v, const Fmt &f)
 {
-	unsigned size=max(f.get_width(), max(f.get_precision(), sizeof(T)*8+3));
+	unsigned size=max(f.get_width(), max<unsigned>(f.get_precision(), sizeof(T)*8+3));
 	char *buf=new char[size];
 	string result(int_to_str(v, f, buf+size), buf+size);
 	delete[] buf;
diff --git a/source/utils.cpp b/source/utils.cpp
index c2bafb9..675a2b1 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -139,13 +139,13 @@ vector<string> split(const string &str, const string &sep, bool allow_empty)
 {
 	vector<string> result;
 	
-	unsigned start=0;
+	string::size_type start=0;
 	if(!allow_empty)
 		start=str.find_first_not_of(sep);
 	
 	while(start<str.size())
 	{
-		unsigned end=str.find_first_of(sep, start);
+		string::size_type end=str.find_first_of(sep, start);
 		result.push_back(str.substr(start, end-start));
 		
 		if(end==string::npos)