[lld] r263251 - More MSVC fixes.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Fri Mar 11 10:32:46 2016
New Revision: 263251

URL: http://llvm.org/viewvc/llvm-project?rev=263251&view=rev
Log:
More MSVC fixes.

Modified:
    lld/trunk/ELF/InputSection.cpp
    lld/trunk/ELF/SymbolTable.cpp
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/InputSection.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=263251&r1=263250&r2=263251&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.cpp (original)
+++ lld/trunk/ELF/InputSection.cpp Fri Mar 11 10:32:46 2016
@@ -369,7 +369,7 @@ EHInputSection<ELFT>::getOffset(uintX_t
 }
 
 template <class ELFT>
-MergeInputSection<ELFT>::MergeInputSection(ObjectFile<ELFT> *F,
+MergeInputSection<ELFT>::MergeInputSection(elf::ObjectFile<ELFT> *F,
                                            const Elf_Shdr *Header)
     : SplitInputSection<ELFT>(F, Header, InputSectionBase<ELFT>::Merge) {}
 

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=263251&r1=263250&r2=263251&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Fri Mar 11 10:32:46 2016
@@ -181,7 +181,7 @@ static void saveBCFile(Module &M) {
 // Merge all the bitcode files we have seen, codegen the result and return
 // the resulting ObjectFile.
 template <class ELFT>
-ObjectFile<ELFT> *SymbolTable<ELFT>::createCombinedLtoObject() {
+elf::ObjectFile<ELFT> *SymbolTable<ELFT>::createCombinedLtoObject() {
   LLVMContext Context;
   Module Combined("ld-temp.o", Context);
   IRMover Mover(Combined);

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263251&r1=263250&r2=263251&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Fri Mar 11 10:32:46 2016
@@ -510,7 +510,8 @@ static void reportUndefined(SymbolTable<
 }
 
 template <class ELFT>
-static bool shouldKeepInSymtab(const ObjectFile<ELFT> &File, StringRef SymName,
+static bool shouldKeepInSymtab(const elf::ObjectFile<ELFT> &File,
+                               StringRef SymName,
                                const typename ELFFile<ELFT>::Elf_Sym &Sym) {
   if (Sym.getType() == STT_FILE)
     return false;
@@ -752,7 +753,7 @@ StringRef Writer<ELFT>::getOutputSection
 
 template <class ELFT>
 void reportDiscarded(InputSectionBase<ELFT> *IS,
-                     const std::unique_ptr<ObjectFile<ELFT>> &File) {
+                     const std::unique_ptr<elf::ObjectFile<ELFT>> &File) {
   if (!Config->PrintGcSections || !IS || IS->Live)
     return;
   llvm::errs() << "removing unused section from '" << IS->getSectionName()