[Lldb-commits] [lldb] r134718 - /lldb/tags/lldb-69/source/Expression/ClangExpressionDeclMap.cpp
Greg Clayton
gclayton at apple.com
Fri Jul 8 11:38:29 PDT 2011
Author: gclayton
Date: Fri Jul 8 13:38:29 2011
New Revision: 134718
URL: http://llvm.org/viewvc/llvm-project?rev=134718&view=rev
Log:
Fix manual merge compile error. Manual source merge == bad idea.
Modified:
lldb/tags/lldb-69/source/Expression/ClangExpressionDeclMap.cpp
Modified: lldb/tags/lldb-69/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/tags/lldb-69/source/Expression/ClangExpressionDeclMap.cpp?rev=134718&r1=134717&r2=134718&view=diff
==============================================================================
--- lldb/tags/lldb-69/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/tags/lldb-69/source/Expression/ClangExpressionDeclMap.cpp Fri Jul 8 13:38:29 2011
@@ -1918,7 +1918,7 @@
void *pointer_target_type = NULL;
if (!ClangASTContext::IsPointerType(self_user_type.GetOpaqueQualType(),
- &pointer_target_type))
+ &pointer_target_type)
|| pointer_target_type == NULL)
return;
More information about the lldb-commits
mailing list