Try to make MSVC 2010 happy.
authorBenjamin Kramer <benny.kra@googlemail.com>
Mon, 19 Sep 2011 20:08:52 +0000 (20:08 +0000)
committerBenjamin Kramer <benny.kra@googlemail.com>
Mon, 19 Sep 2011 20:08:52 +0000 (20:08 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140042 91177308-0d34-0410-b5e6-96231b3b80d8

tools/llvm-objdump/MachODump.cpp

index 49687d1ceaefaccdd783ac9388de66ba3ddcac9f..3085348605434f2d2266eb9e9e9b5e50764975b7 100644 (file)
@@ -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));
       }
     }