Removed explicit NULL checks for shared pointers
and instead made us use implicit casts to bool.
This generated a warning in C++11.
<rdar://problem/11930775>
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@161559 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index e4c5a17..68467a7 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -2657,7 +2657,7 @@
err);
// If we found a variable in scope, no need to pull up function names
- if (err.Success() && var != NULL)
+ if (err.Success() && var)
{
AddOneVariable(context, var, valobj, current_id);
context.m_found.variable = true;
diff --git a/source/Expression/ClangExpressionParser.cpp b/source/Expression/ClangExpressionParser.cpp
index 22fae91..88e7323 100644
--- a/source/Expression/ClangExpressionParser.cpp
+++ b/source/Expression/ClangExpressionParser.cpp
@@ -756,7 +756,7 @@
lldb::DisassemblerSP disassembler = Disassembler::FindPlugin(arch, NULL);
- if (disassembler == NULL)
+ if (!disassembler)
{
ret.SetErrorToGenericError();
ret.SetErrorStringWithFormat("Unable to find disassembler plug-in for %s architecture.", arch.GetArchitectureName());
diff --git a/source/Expression/ClangFunction.cpp b/source/Expression/ClangFunction.cpp
index f716f67..ad6f0db 100644
--- a/source/Expression/ClangFunction.cpp
+++ b/source/Expression/ClangFunction.cpp
@@ -499,7 +499,7 @@
stop_others,
discard_on_error,
this_arg));
- if (call_plan_sp == NULL)
+ if (!call_plan_sp)
return eExecutionSetupError;
call_plan_sp->SetPrivate(true);
diff --git a/source/Expression/ClangUserExpression.cpp b/source/Expression/ClangUserExpression.cpp
index 029b153..b1bef73 100644
--- a/source/Expression/ClangUserExpression.cpp
+++ b/source/Expression/ClangUserExpression.cpp
@@ -572,7 +572,7 @@
((m_needs_object_ptr && m_objectivec) ? &cmd_ptr : NULL),
shared_ptr_to_me));
- if (call_plan_sp == NULL || !call_plan_sp->ValidatePlan (NULL))
+ if (!call_plan_sp || !call_plan_sp->ValidatePlan (NULL))
return eExecutionSetupError;
lldb::addr_t function_stack_pointer = static_cast<ThreadPlanCallFunction *>(call_plan_sp.get())->GetFunctionStackPointer();
diff --git a/source/Expression/IRInterpreter.cpp b/source/Expression/IRInterpreter.cpp
index 8ff34cf..5d2c097 100644
--- a/source/Expression/IRInterpreter.cpp
+++ b/source/Expression/IRInterpreter.cpp
@@ -159,12 +159,12 @@
bool IsValid ()
{
- return m_allocation != NULL;
+ return m_allocation;
}
bool IsInvalid ()
{
- return m_allocation == NULL;
+ return !m_allocation;
}
};