X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.h;h=d74872c2d5dba9365d9e08c717625c45afcb0661;hb=eadb72197ef2fde2a44914067277054c59b67161;hp=90151fe86983163cd87edb61ad5624e08707db80;hpb=cd993966c0729074329df1a59ad46c82c68c0928;p=builder.git

diff --git a/source/virtualfilesystem.h b/source/virtualfilesystem.h
index 90151fe..d74872c 100644
--- a/source/virtualfilesystem.h
+++ b/source/virtualfilesystem.h
@@ -10,6 +10,7 @@
 class Builder;
 class FileTarget;
 class Pattern;
+class Tool;
 
 /**
 Provides access to the filesystem in a way that takes known targets into
@@ -19,13 +20,11 @@ possible to build them.
 class VirtualFileSystem
 {
 public:
-	typedef std::list<Msp::FS::Path> SearchPath;
+	using SearchPath = std::list<Msp::FS::Path>;
 
 private:
-	typedef std::map<Msp::FS::Path, FileTarget *> TargetMap;
-
 	Builder &builder;
-	TargetMap targets;
+	std::map<Msp::FS::Path, FileTarget *> targets;
 	std::set<Msp::FS::Path> nonexistent;
 
 public:
@@ -42,7 +41,7 @@ public:
 	/** Locates a source file.  If a file is found but no target is associated
 	with it, a new package-less target is created with the appropriate tool.  If
 	use_syspath is true, the system path reported by the tool is also searched. */
-	FileTarget *find_header(const std::string &, const Tool *, const SearchPath &, bool use_syspath = true);
+	FileTarget *find_header(const std::string &, Tool *, const SearchPath &, bool use_syspath = true);
 
 	/** Locates a library.  The library name should be the same as what would be
 	used in linking with the library.  If a file is found but no target is