summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Chen <johnny.chen@apple.com>2010-09-28 16:10:54 +0000
committerJohnny Chen <johnny.chen@apple.com>2010-09-28 16:10:54 +0000
commitd440bccb16ae883dd40ea0c624c8d1a1cf983e05 (patch)
tree7ef007b2f953ba08c3fb8163e6ad984b40c0e469
parenta8298d3ba5de355b00886767835df2c13c215b06 (diff)
Fix from Jean-Daniel. Thanks.
Error in object runtime language detection code (spurious '; ') Also replace false by NULL in a place where the compiler expects a pointer instead of a bool. llvm-svn: 114957
-rw-r--r--lldb/source/Core/ValueObject.cpp2
-rw-r--r--lldb/source/Symbol/ClangASTContext.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 6bb03927168e..e98e552cd96b 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -779,7 +779,7 @@ ValueObject::GetObjectRuntimeLanguage ()
{
if (ClangASTContext::IsObjCClassType (opaque_qual_type))
return lldb::eLanguageTypeObjC;
- if (ClangASTContext::IsCXXClassType (opaque_qual_type));
+ if (ClangASTContext::IsCXXClassType (opaque_qual_type))
return lldb::eLanguageTypeC_plus_plus;
}
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 287ae7687352..cf223b4cfb0c 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -817,7 +817,7 @@ ClangASTContext::AddMethodToCXXRecordType
)
{
if (!record_opaque_type || !method_opaque_type || !name)
- return false;
+ return NULL;
assert(ast_context);