X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvirtualfilesystem.cpp;h=935600de085f6409a157a0303e68b7f39c168da1;hb=b45cfe5e437ca79bb3176618769628c58c0734d1;hp=e240fb9e777b74590f39dfe23d2d417d18fb7303;hpb=2193df46d4e7721dbb99ce744fbc884c2447e1f9;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index e240fb9..935600d 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -51,21 +51,21 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
 		combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
 	}
 
-	for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+	for(const FS::Path &p: combined_path)
 	{
-		FS::Path filename = *i/name;
+		FS::Path filename = p/name;
 		if(FileTarget *tgt = get_target(filename))
 		{
-			builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, i->str(), tgt->get_type()));
+			builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, p.str(), tgt->get_type()));
 			return tgt;
 		}
 		else if(file_exists(filename))
 		{
-			builder.get_logger().log("vfs", format("Header %s found in %s", name, i->str()));
+			builder.get_logger().log("vfs", format("Header %s found in %s", name, p.str()));
 			return dynamic_cast<FileTarget *>(tool->create_source(filename));
 		}
 
-		builder.get_logger().log("vfs", format("Header %s not found in %s", name, i->str()));
+		builder.get_logger().log("vfs", format("Header %s not found in %s", name, p.str()));
 	}
 
 	return 0;
@@ -97,20 +97,20 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 	if(mode!=BuildInfo::FORCE_DYNAMIC)
 		static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
 
-	for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+	for(const FS::Path &p: combined_path)
 	{
 		const list<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
-		for(list<string>::const_iterator j=cur_names->begin(); j!=cur_names->end(); )
+		for(auto j=cur_names->begin(); j!=cur_names->end(); )
 		{
-			FS::Path filename = *i / *j;
+			FS::Path filename = p / *j;
 			if(FileTarget *tgt = get_target(filename))
 			{
-				builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
+				builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type()));
 				return tgt;
 			}
 			else if(file_exists(filename))
 			{
-				builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
+				builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, p.str()));
 				if(cur_names==&shared_names)
 				{
 					if(use_import_lib)
@@ -133,7 +133,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 			}
 		}
 
-		builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str()));
+		builder.get_logger().log("vfs", format("Library %s not found in %s", lib, p.str()));
 	}
 
 	return 0;
@@ -149,9 +149,8 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
 		string env_path = Msp::getenv("PATH");
 		if(!env_path.empty())
 		{
-			vector<string> parts = split(env_path, ':');
-			for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-				path.push_back(*i);
+			for(const string &p: split(env_path, ':'))
+				path.push_back(p);
 		}
 		else
 		{
@@ -160,21 +159,21 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
 		}
 	}
 
-	for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)
+	for(const FS::Path &p: path)
 	{
-		FS::Path filename = *i/name;
+		FS::Path filename = p/name;
 		if(FileTarget *tgt = get_target(filename))
 		{
-			builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, *i, tgt->get_type()));
+			builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, p, tgt->get_type()));
 			return tgt;
 		}
 		else if(file_exists(filename))
 		{
-			builder.get_logger().log("vfs", format("Binary %s found in %s", name, *i));
+			builder.get_logger().log("vfs", format("Binary %s found in %s", name, p));
 			return new Executable(builder, filename);
 		}
 
-		builder.get_logger().log("vfs", format("Binary %s not found in %s", name, *i));
+		builder.get_logger().log("vfs", format("Binary %s not found in %s", name, p));
 	}
 
 	return 0;