diff options
Diffstat (limited to 'source/Target/StackID.cpp')
| -rw-r--r-- | source/Target/StackID.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source/Target/StackID.cpp b/source/Target/StackID.cpp index ca337f914406..222b2d3f2aa8 100644 --- a/source/Target/StackID.cpp +++ b/source/Target/StackID.cpp @@ -7,12 +7,11 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Target/StackID.h" - // C Includes // C++ Includes // Other libraries and framework includes // Project includes +#include "lldb/Target/StackID.h" #include "lldb/Core/Stream.h" #include "lldb/Symbol/Block.h" #include "lldb/Symbol/Symbol.h" @@ -20,7 +19,6 @@ using namespace lldb_private; - void StackID::Dump (Stream *s) { @@ -48,8 +46,8 @@ lldb_private::operator== (const StackID& lhs, const StackID& rhs) SymbolContextScope *lhs_scope = lhs.GetSymbolContextScope(); SymbolContextScope *rhs_scope = rhs.GetSymbolContextScope(); - // Only compare the PC values if both symbol context scopes are NULL - if (lhs_scope == NULL && rhs_scope == NULL) + // Only compare the PC values if both symbol context scopes are nullptr + if (lhs_scope == nullptr && rhs_scope == nullptr) return lhs.GetPC() == rhs.GetPC(); return lhs_scope == rhs_scope; @@ -64,7 +62,7 @@ lldb_private::operator!= (const StackID& lhs, const StackID& rhs) SymbolContextScope *lhs_scope = lhs.GetSymbolContextScope(); SymbolContextScope *rhs_scope = rhs.GetSymbolContextScope(); - if (lhs_scope == NULL && rhs_scope == NULL) + if (lhs_scope == nullptr && rhs_scope == nullptr) return lhs.GetPC() != rhs.GetPC(); return lhs_scope != rhs_scope; @@ -88,7 +86,7 @@ lldb_private::operator< (const StackID& lhs, const StackID& rhs) SymbolContextScope *lhs_scope = lhs.GetSymbolContextScope(); SymbolContextScope *rhs_scope = rhs.GetSymbolContextScope(); - if (lhs_scope != NULL && rhs_scope != NULL) + if (lhs_scope != nullptr && rhs_scope != nullptr) { // Same exact scope, lhs is not less than (younger than rhs) if (lhs_scope == rhs_scope) @@ -101,8 +99,8 @@ lldb_private::operator< (const StackID& lhs, const StackID& rhs) // Items with the same function can only be compared if (lhs_sc.function == rhs_sc.function && - lhs_sc.function != NULL && lhs_sc.block != NULL && - rhs_sc.function != NULL && rhs_sc.block != NULL) + lhs_sc.function != nullptr && lhs_sc.block != nullptr && + rhs_sc.function != nullptr && rhs_sc.block != nullptr) { return rhs_sc.block->Contains (lhs_sc.block); } |