X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=297efff1df0c915ee4d51a31d831d0051ed58293;hb=2f1e3b296bb8a2c4fcb73d7339cf7d0d6f9d1459;hp=f10e21e5aeee4f3a24c78cfbca194b897c13b16d;hpb=45c778b1976de1a3093e0c6fb5e2a94c42073dcb;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index f10e21e..297efff 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -27,9 +27,9 @@ public:
 	
 	enum UpdateLevel
 	{
-		LOCAL,
-		DEPENDENCY,
-		CHAINED
+		LOCAL,       //< Include all information
+		DEPENDENCY,  //< Include all but code generation options
+		CHAINED      //< Include only compilation options
 	};
 
 	typedef std::map<std::string, std::string> DefineMap;
@@ -46,9 +46,13 @@ public:
 
 	BuildInfo();
 
-	/** Adds another BuildInfo to the end of this one. */
+	/** Updates the BuildInfo from another one.  Lists are concatenated, with
+	the first occurrence of each item preserved.  Scalars are overwritten.
+	
+	The update level determines what information is updated. */
 	void update_from(const BuildInfo &, UpdateLevel = LOCAL);
 
+private:
 	/** Makes sure there are no duplicate entries in the lists.  For warnings,
 	contradicting flags are eliminated and the last one stays in effect. */
 	void unique();