commit fb0026b41b6f3feea41b96e26a15ddef519c1f46
author Johnny Chen <johnny.chen@apple.com> Mon Jan 30 21:16:22 2012 +0000
committer Johnny Chen <johnny.chen@apple.com> Mon Jan 30 21:16:22 2012 +0000
tree 0c7a69ace0c98e50760a7ab0413141a65ed9ee7f
parent 573d85c4dbfcf7d4c518a47f3354371715e853bf

Make BreakpointLocation::IsEnabled() consistent with the BreakpointLocation::SetEnabled() implementation.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@149277 91177308-0d34-0410-b5e6-96231b3b80d8

source/Breakpoint/BreakpointLocation.cpp

diff --git a/source/Breakpoint/BreakpointLocation.cpp b/source/Breakpoint/BreakpointLocation.cpp
index fb123de..a898c33 100644
--- a/source/Breakpoint/BreakpointLocation.cpp
+++ b/source/Breakpoint/BreakpointLocation.cpp
@@ -70,14 +70,12 @@
 }
 
 bool
-BreakpointLocation::IsEnabled ()
+BreakpointLocation::IsEnabled () const
 {
-    if (!m_owner.IsEnabled())
-        return false;
-    else if (m_options_ap.get() != NULL)
+    if (m_options_ap.get() != NULL)
         return m_options_ap->IsEnabled();
     else
-        return true;
+        return m_owner.IsEnabled();
 }
 
 void
@@ -414,7 +412,7 @@
               GetID(),
               GetOptionsNoCreate()->GetThreadSpecNoCreate()->GetTID(),
               (uint64_t) m_address.GetOpcodeLoadAddress (&m_owner.GetTarget()),
-              (m_options_ap.get() ? m_options_ap->IsEnabled() : m_owner.IsEnabled()) ? "enabled " : "disabled",
+              IsEnabled() ? "enabled " : "disabled",
               IsHardware() ? "hardware" : "software",
               GetHardwareIndex(),
               GetHitCount(),