From: Mikko Rasa Date: Tue, 17 Jul 2012 12:26:46 +0000 (+0300) Subject: Merge BuildInfo::unique into update_from X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=6ed04f66e56958890c2ecca82fa3885f10f8adf0;p=builder.git Merge BuildInfo::unique into update_from --- diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp index 12fcac5..b7f9c5c 100644 --- a/source/buildinfo.cpp +++ b/source/buildinfo.cpp @@ -57,14 +57,9 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level) fatal_warnings = bi.fatal_warnings; } - unique(); -} - -void BuildInfo::unique() -{ - ::unique(incpath); - ::unique(libpath); - ::unique(libs); + unique(incpath); + unique(libpath); + unique(libs); } diff --git a/source/buildinfo.h b/source/buildinfo.h index 8bedcec..ca8819d 100644 --- a/source/buildinfo.h +++ b/source/buildinfo.h @@ -62,11 +62,6 @@ public: 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(); }; #endif