Don't append library version to the end of the filename on Windows

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 12fcac5286558e0963b97032842076c3f5feb012..c02d115fd1b252e409191834a9ca45730efeaaf1 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);
 }
 
 
@@ -105,7 +100,7 @@ void BuildInfo::Loader::library(const string &s)
 }
 
 
-void operator>>(LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
+void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {
        if(conv.get()=="FORCE_STATIC")
                libmode = BuildInfo::FORCE_STATIC;