X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinkArchives.cpp;h=99f3a1b60d28497fcb3d6a7d3a50d85da48789f5;hb=12945acd4aa40b40b1517bcf785622ab9671893f;hp=69549251b9f17432031b3b22dd4db825041eb06a;hpb=50c301b9bbf80c00d26e49129a2a5d02132b9b2b;p=oota-llvm.git

diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp
index 69549251b9f..99f3a1b60d2 100644
--- a/lib/Linker/LinkArchives.cpp
+++ b/lib/Linker/LinkArchives.cpp
@@ -154,7 +154,7 @@ Linker::LinkInArchive(const sys::Path &Filename) {
       verbose("  Linking in module: " + aModule->getModuleIdentifier());
 
       // Link it in
-      if (this->LinkInModule(aModule))
+      if (LinkInModule(aModule))
         return error("Cannot link in module '" + 
                      aModule->getModuleIdentifier() + "': " + Error);
     }
@@ -168,8 +168,7 @@ Linker::LinkInArchive(const sys::Path &Filename) {
     // NotDefinedByArchive which holds symbols we know the archive doesn't
     // define. There's no point searching for symbols that we won't find in the
     // archive so we subtract these sets.
-    set_subtract<std::set<std::string>,std::set<std::string> >(
-        UndefinedSymbols,NotDefinedByArchive);
+    set_subtract(UndefinedSymbols, NotDefinedByArchive);
     
     // If there's no symbols left, no point in continuing to search the
     // archive.