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/API/SBDeclaration.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'source/API/SBDeclaration.cpp') diff --git a/source/API/SBDeclaration.cpp b/source/API/SBDeclaration.cpp index fc90156e75ad9..8aea675afeba9 100644 --- a/source/API/SBDeclaration.cpp +++ b/source/API/SBDeclaration.cpp @@ -74,19 +74,21 @@ SBFileSpec SBDeclaration::GetFileSpec () const { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - + SBFileSpec sb_file_spec; if (m_opaque_ap.get() && m_opaque_ap->GetFile()) sb_file_spec.SetFileSpec(m_opaque_ap->GetFile()); - + if (log) { SBStream sstr; sb_file_spec.GetDescription (sstr); - log->Printf ("SBLineEntry(%p)::GetFileSpec () => SBFileSpec(%p): %s", m_opaque_ap.get(), - sb_file_spec.get(), sstr.GetData()); + log->Printf ("SBLineEntry(%p)::GetFileSpec () => SBFileSpec(%p): %s", + static_cast(m_opaque_ap.get()), + static_cast(sb_file_spec.get()), + sstr.GetData()); } - + return sb_file_spec; } @@ -94,14 +96,15 @@ uint32_t SBDeclaration::GetLine () const { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - + uint32_t line = 0; if (m_opaque_ap.get()) line = m_opaque_ap->GetLine(); - + if (log) - log->Printf ("SBLineEntry(%p)::GetLine () => %u", m_opaque_ap.get(), line); - + log->Printf ("SBLineEntry(%p)::GetLine () => %u", + static_cast(m_opaque_ap.get()), line); + return line; } -- cgit v1.2.3