Merge BuildInfo::unique into update_from

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 12fcac5286558e0963b97032842076c3f5feb012..b7f9c5cc0c9f8cdc54d21d574892adf37c419aad 100644 (file)
--- 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 8bedcec4c7506d4a0209b92ef33f269948679ac0..ca8819d59e55ec234fbfeb5a67aa2c5bfdf58ee6 100644 (file)
--- 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