diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-05-08 00:28:30 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-05-08 00:28:30 +0000 |
| commit | f4e04ae3a71a358de0f03a3e5752a9c0bbe7af5c (patch) | |
| tree | 3f909424b6b2757cc3d48df9d094be2c795a76c5 /lib/CodeGen | |
| parent | 9fc5105a7c9508d9a404c71855c9dc844621b7d1 (diff) | |
Merging r181296:
------------------------------------------------------------------------
r181296 | timurrrr | 2013-05-07 00:47:47 -0700 (Tue, 07 May 2013) | 1 line
Fix the VS2010 build broken by r181271
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_33@181379 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index dd233eaa1b..aeaa63f2af 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -606,7 +606,8 @@ DIE *DwarfDebug::constructScopeDIE(CompileUnit *TheCU, LexicalScope *Scope) { 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); |