From 2856d46252db5af0c90fec552ffc4a80a4654db2 Mon Sep 17 00:00:00 2001
From: Greg Clayton <gclayton@apple.com>
Date: Tue, 2 Nov 2010 03:02:38 +0000
Subject: [PATCH] Fixed the default file and line breakpoints to include
 inlined breakpoints.

llvm-svn: 118002
---
 lldb/source/Commands/CommandObjectBreakpoint.cpp | 6 +++---
 lldb/source/Commands/CommandObjectBreakpoint.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp
index 237ac89a35ec..5dc5c0ac11ed 100644
--- a/lldb/source/Commands/CommandObjectBreakpoint.cpp
+++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp
@@ -52,7 +52,7 @@ CommandObjectBreakpointSet::CommandOptions::CommandOptions() :
     m_filename (),
     m_line_num (0),
     m_column (0),
-    m_ignore_inlines (false),
+    m_check_inlines (true),
     m_func_name (),
     m_func_name_type_mask (0),
     m_func_regexp (),
@@ -367,7 +367,7 @@ CommandObjectBreakpointSet::Execute
                         bp = target->CreateBreakpoint (&module_spec,
                                                        file,
                                                        m_options.m_line_num,
-                                                       m_options.m_ignore_inlines).get();
+                                                       m_options.m_check_inlines).get();
                         if (bp)
                         {
                             StreamString &output_stream = result.GetOutputStream();
@@ -391,7 +391,7 @@ CommandObjectBreakpointSet::Execute
                     bp = target->CreateBreakpoint (NULL,
                                                    file,
                                                    m_options.m_line_num,
-                                                   m_options.m_ignore_inlines).get();
+                                                   m_options.m_check_inlines).get();
             }
             break;
 
diff --git a/lldb/source/Commands/CommandObjectBreakpoint.h b/lldb/source/Commands/CommandObjectBreakpoint.h
index fb13576479a6..5b093151f87d 100644
--- a/lldb/source/Commands/CommandObjectBreakpoint.h
+++ b/lldb/source/Commands/CommandObjectBreakpoint.h
@@ -99,7 +99,7 @@ public:
         std::string m_filename;
         uint32_t m_line_num;
         uint32_t m_column;
-        bool m_ignore_inlines;
+        bool m_check_inlines;
         std::string m_func_name;
         uint32_t m_func_name_type_mask;
         std::string m_func_regexp;