[llvm-branch-commits] [llvm-branch] r181379 - Merging r181296:

[Bill Wendling]

Author: void
Date: Tue May  7 19:28:30 2013
New Revision: 181379

URL: http://llvm.org/viewvc/llvm-project?rev=181379&view=rev
Log:
Merging r181296:
------------------------------------------------------------------------
r181296 | timurrrr | 2013-05-07 00:47:47 -0700 (Tue, 07 May 2013) | 1 line

Fix the VS2010 build broken by r181271
------------------------------------------------------------------------

Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  7 19:28:30 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241
+/llvm/trunk:155241,181296

Modified: llvm/branches/release_33/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=181379&r1=181378&r2=181379&view=diff
==============================================================================
--- llvm/branches/release_33/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/branches/release_33/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue May  7 19:28:30 2013
@@ -606,7 +606,8 @@ DIE *DwarfDebug::constructScopeDIE(Compi
     std::pair<ImportedEntityMap::const_iterator,
               ImportedEntityMap::const_iterator> Range = std::equal_range(
         ScopesWithImportedEntities.begin(), ScopesWithImportedEntities.end(),
-        std::pair<const MDNode *, const MDNode *>(DS, 0), CompareFirst());
+        std::pair<const MDNode *, const MDNode *>(DS, (const MDNode*)0),
+        CompareFirst());
     if (Children.empty() && Range.first == Range.second)
       return NULL;
     ScopeDIE = constructLexicalScopeDIE(TheCU, Scope);