From 0cac4ca3916ac24ab6139d03cbfd18db9e715bfe Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 25 Nov 2014 21:00:58 +0000 Subject: Import LLDB as of upstream SVN r216948 (git 50f7fe44) This corresponds with the branchpoint for the 3.5 release. A number of files not required for the FreeBSD build have been removed. Sponsored by: DARPA, AFRL --- source/Target/StackFrameList.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/Target/StackFrameList.cpp') diff --git a/source/Target/StackFrameList.cpp b/source/Target/StackFrameList.cpp index 631a77bd4951..99234dc61f1d 100644 --- a/source/Target/StackFrameList.cpp +++ b/source/Target/StackFrameList.cpp @@ -269,7 +269,7 @@ StackFrameList::GetFramesUpTo(uint32_t end_idx) StreamFile s(stdout, false); #endif // If we are hiding some frames from the outside world, we need to add those onto the total count of - // frames to fetch. However, we don't need ot do that if end_idx is 0 since in that case we always + // frames to fetch. However, we don't need to do that if end_idx is 0 since in that case we always // get the first concrete frame and all the inlined frames below it... And of course, if end_idx is // UINT32_MAX that means get all, so just do that... @@ -491,7 +491,7 @@ StackFrameList::Dump (Stream *s) for (pos = begin; pos != end; ++pos) { StackFrame *frame = (*pos).get(); - s->Printf("%p: ", frame); + s->Printf("%p: ", static_cast(frame)); if (frame) { frame->GetStackID().Dump (s); -- cgit v1.3