diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2011-09-19 20:08:52 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2011-09-19 20:08:52 +0000 |
| commit | 4d906381307334cfed187226c548129c3421d0c4 (patch) | |
| tree | fefd239f2a780d436168e66b6c14d7724353067a /tools/llvm-objdump | |
| parent | 061c3c450660976411ee7ff02774ae491ab3ee79 (diff) | |
| download | llvm-4d906381307334cfed187226c548129c3421d0c4.tar.gz llvm-4d906381307334cfed187226c548129c3421d0c4.tar.bz2 llvm-4d906381307334cfed187226c548129c3421d0c4.tar.xz | |
Try to make MSVC 2010 happy.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140042 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-objdump')
| -rw-r--r-- | tools/llvm-objdump/MachODump.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index 49687d1cea..3085348605 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -271,7 +271,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) { uint64_t VMAddr = Sections[SectIdx].Address - Sections[SectIdx].Offset; for (unsigned i = 0, e = FoundFns.size(); i != e; ++i) - FunctionMap.insert(std::pair<uint64_t,MCFunction*>(FoundFns[i]+VMAddr,0)); + FunctionMap.insert(std::make_pair(FoundFns[i]+VMAddr, (MCFunction*)0)); StringRef Bytes = MachOObj->getData(Sections[SectIdx].Offset, Sections[SectIdx].Size); @@ -335,7 +335,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) { FunctionMap[Start] = &Functions.back(); for (unsigned i = 0, e = Calls.size(); i != e; ++i) - FunctionMap.insert(std::pair<uint64_t, MCFunction*>(Calls[i], 0)); + FunctionMap.insert(std::make_pair(Calls[i], (MCFunction*)0)); } } |