From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 20 Sep 2009 16:19:05 +0000 (+0000)
Subject: Fix compile errors on 64-bit systems
X-Git-Tag: 1.0~7
X-Git-Url: http://git.tdb.fi/?p=builder.git;a=commitdiff_plain;h=36a7c1a4d4d2b45be16c1e5d862af51e0ded1e93

Fix compile errors on 64-bit systems
---

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 37c8911..eae9de7 100644
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -95,7 +95,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
 void Analyzer::print_table() const
 {
-	vector<unsigned> col_width;
+	vector<string::size_type> col_width;
 
 	// Determine column widths
 	for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
diff --git a/source/builder.cpp b/source/builder.cpp
index 21d311a..5fb918c 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -124,7 +124,7 @@ Builder::Builder(int argc, char **argv):
 	const vector<string> &args=getopt.get_args();
 	for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
 	{
-		unsigned equal=i->find('=');
+		string::size_type equal=i->find('=');
 		if(equal!=string::npos)
 			cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1)));
 		else
@@ -387,7 +387,7 @@ Target *Builder::get_header(const string &include, const FS::Path &from, const l
 		cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
 		while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
 		{
-			unsigned dot=cxx_ver.rfind('.');
+			string::size_type dot=cxx_ver.rfind('.');
 			if(dot==string::npos)
 				break;
 			cxx_ver.erase(dot);
diff --git a/source/condition.cpp b/source/condition.cpp
index e0068e0..4c9ac0b 100644
--- a/source/condition.cpp
+++ b/source/condition.cpp
@@ -23,7 +23,7 @@ Condition::Condition(SourcePackage &p, const string &expr):
 		if(*i=="and")
 			continue;
 
-		unsigned token=i->find_first_of("=!");
+		string::size_type token=i->find_first_of("=!");
 		if(token==string::npos)
 			expression.insert(StringMap::value_type(*i, "!0"));
 		else if(token==0 && (*i)[0]=='!')
diff --git a/source/config.cpp b/source/config.cpp
index 4c06c83..99bfeea 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -103,10 +103,10 @@ void Config::finish()
 		for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i)
 		{
 			Option &opt=i->second;
-			unsigned dollar=0;
+			string::size_type dollar=0;
 			while((dollar=opt.value.find('$', dollar))!=string::npos)
 			{
-				unsigned end;
+				string::size_type end;
 				string var;
 				if(opt.value[dollar+1]=='{')
 				{