[Lldb-commits] [lldb] r124874 - in /lldb/trunk: include/lldb/Core/FileSpec.h include/lldb/Target/StackFrame.h source/Target/ThreadPlanStepOut.cpp

[Johnny Chen]

Author: johnny
Date: Fri Feb  4 11:21:08 2011
New Revision: 124874

URL: http://llvm.org/viewvc/llvm-project?rev=124874&view=rev
Log:
Patches from Jean-Daniel:

One (stepout.patch) to fix a problem in ThreadPlanStepOut.cpp. There is an erroneous semi colon at end of an if statement that make the condition useless (if body is empty).

And the second patch is to remove to useless typedef on enum, and so avoid a lot of warnings with clang++.

Modified:
    lldb/trunk/include/lldb/Core/FileSpec.h
    lldb/trunk/include/lldb/Target/StackFrame.h
    lldb/trunk/source/Target/ThreadPlanStepOut.cpp

Modified: lldb/trunk/include/lldb/Core/FileSpec.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FileSpec.h?rev=124874&r1=124873&r2=124874&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FileSpec.h (original)
+++ lldb/trunk/include/lldb/Core/FileSpec.h Fri Feb  4 11:21:08 2011
@@ -544,7 +544,7 @@
     static size_t
     ResolveUsername (const char *src_path, char *dst_path, size_t dst_len);
 
-    typedef enum EnumerateDirectoryResult
+    enum EnumerateDirectoryResult
     {
         eEnumerateDirectoryResultNext,  // Enumerate next entry in the current directory
         eEnumerateDirectoryResultEnter, // Recurse into the current entry if it is a directory or symlink, or next if not

Modified: lldb/trunk/include/lldb/Target/StackFrame.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/StackFrame.h?rev=124874&r1=124873&r2=124874&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/StackFrame.h (original)
+++ lldb/trunk/include/lldb/Target/StackFrame.h Fri Feb  4 11:21:08 2011
@@ -30,7 +30,7 @@
     public ExecutionContextScope
 {
 public:
-    typedef enum ExpressionPathOption
+    enum ExpressionPathOption
     {
         eExpressionPathOptionCheckPtrVsMember   = (1u << 0),
         eExpressionPathOptionsNoFragileObjcIvar = (1u << 1)

Modified: lldb/trunk/source/Target/ThreadPlanStepOut.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepOut.cpp?rev=124874&r1=124873&r2=124874&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepOut.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepOut.cpp Fri Feb  4 11:21:08 2011
@@ -114,7 +114,7 @@
             if (site_sp && site_sp->IsBreakpointAtThisSite (m_return_bp_id))
             {
                 const uint32_t num_frames = m_thread.GetStackFrameCount();
-                if (m_stack_depth > num_frames);
+                if (m_stack_depth > num_frames)
                     SetPlanComplete();
 
                 // If there was only one owner, then we're done.  But if we also hit some