[llvm] r188057 - Try to unbreak Windows build after r188022

Alexey Samsonov samsonov at google.com
Fri Aug 9 00:34:07 PDT 2013


Author: samsonov
Date: Fri Aug  9 02:34:06 2013
New Revision: 188057

URL: http://llvm.org/viewvc/llvm-project?rev=188057&view=rev
Log:
Try to unbreak Windows build after r188022

Modified:
    llvm/trunk/include/llvm/Object/ELF.h

Modified: llvm/trunk/include/llvm/Object/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=188057&r1=188056&r2=188057&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELF.h (original)
+++ llvm/trunk/include/llvm/Object/ELF.h Fri Aug  9 02:34:06 2013
@@ -565,7 +565,7 @@ std::pair<const typename ELFFile<ELFT>::
           const typename ELFFile<ELFT>::Elf_Sym *>
 ELFFile<ELFT>::getRelocationSymbol(const Elf_Shdr *Sec, const RelT *Rel) const {
   if (!Sec->sh_link)
-    return std::pair<const Elf_Shdr *, const Elf_Sym *>(0, 0);
+    return std::make_pair((const Elf_Shdr *)0, (const Elf_Sym *)0);
   const Elf_Shdr *SymTable = getSection(Sec->sh_link);
   return std::make_pair(
       SymTable, getEntry<Elf_Sym>(SymTable, Rel->getSymbol(isMips64EL())));





More information about the llvm-commits mailing list