[lld] r263253 - Yet more MSVC fixes.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Fri Mar 11 08:41:23 PST 2016


Author: rafael
Date: Fri Mar 11 10:41:23 2016
New Revision: 263253

URL: http://llvm.org/viewvc/llvm-project?rev=263253&view=rev
Log:
Yet more MSVC fixes.

Modified:
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263253&r1=263252&r2=263253&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Fri Mar 11 10:41:23 2016
@@ -547,7 +547,8 @@ static bool shouldKeepInSymtab(const elf
 template <class ELFT> void Writer<ELFT>::copyLocalSymbols() {
   if (!Out<ELFT>::SymTab)
     return;
-  for (const std::unique_ptr<ObjectFile<ELFT>> &F : Symtab.getObjectFiles()) {
+  for (const std::unique_ptr<elf::ObjectFile<ELFT>> &F :
+       Symtab.getObjectFiles()) {
     for (SymbolBody *B : F->getLocalSymbols()) {
       auto *L = cast<DefinedRegular<ELFT>>(B);
       const Elf_Sym &Sym = L->Sym;
@@ -951,7 +952,8 @@ template <class ELFT> bool Writer<ELFT>:
   // Create output sections for input object file sections.
   std::vector<OutputSectionBase<ELFT> *> RegularSections;
   OutputSectionFactory<ELFT> Factory;
-  for (const std::unique_ptr<ObjectFile<ELFT>> &F : Symtab.getObjectFiles()) {
+  for (const std::unique_ptr<elf::ObjectFile<ELFT>> &F :
+       Symtab.getObjectFiles()) {
     for (InputSectionBase<ELFT> *C : F->getSections()) {
       if (isDiscarded(C)) {
         reportDiscarded(C, F);
@@ -1011,7 +1013,8 @@ template <class ELFT> bool Writer<ELFT>:
 
   // Scan relocations. This must be done after every symbol is declared so that
   // we can correctly decide if a dynamic relocation is needed.
-  for (const std::unique_ptr<ObjectFile<ELFT>> &F : Symtab.getObjectFiles()) {
+  for (const std::unique_ptr<elf::ObjectFile<ELFT>> &F :
+       Symtab.getObjectFiles()) {
     for (InputSectionBase<ELFT> *C : F->getSections()) {
       if (isDiscarded(C))
         continue;




More information about the llvm-commits mailing list