diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-08-09 07:34:06 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-08-09 07:34:06 +0000 |
| commit | 1b8ac539825d10b38d12759a862f43f7b40ddd9a (patch) | |
| tree | 15f391cc50580ba03bcce606386ba19a2bb04429 | |
| parent | 4f75d9b31b4ae68000540d818d3bb8c21626b3df (diff) | |
| download | external_llvm-1b8ac539825d10b38d12759a862f43f7b40ddd9a.zip external_llvm-1b8ac539825d10b38d12759a862f43f7b40ddd9a.tar.gz external_llvm-1b8ac539825d10b38d12759a862f43f7b40ddd9a.tar.bz2 | |
Try to unbreak Windows build after r188022
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188057 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/Object/ELF.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h index 39a8c98..a6774c1 100644 --- a/include/llvm/Object/ELF.h +++ b/include/llvm/Object/ELF.h @@ -565,7 +565,7 @@ std::pair<const typename ELFFile<ELFT>::Elf_Shdr *, 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()))); |