[llvm-commits] [llvm] r140042 - /llvm/trunk/tools/llvm-objdump/MachODump.cpp

[Benjamin Kramer]

Author: d0k
Date: Mon Sep 19 15:08:52 2011
New Revision: 140042

URL: http://llvm.org/viewvc/llvm-project?rev=140042&view=rev
Log:
Try to make MSVC 2010 happy.

Modified:
    llvm/trunk/tools/llvm-objdump/MachODump.cpp

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=140042&r1=140041&r2=140042&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Mon Sep 19 15:08:52 2011
@@ -271,7 +271,7 @@
 
     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 @@
         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));
       }
     }