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

1 files changed, 8 insertions, 9 deletions

diff --git a/source/Core/Event.cpp b/source/Core/Event.cpp
index 2d4899d..bf5ff22 100644
--- a/source/Core/Event.cpp
+++ b/source/Core/Event.cpp
@@ -57,20 +57,19 @@ Event::Dump (Stream *s) const
         StreamString event_name;
         if (m_broadcaster->GetEventNames (event_name, m_type, false))
             s->Printf("%p Event: broadcaster = %p (%s), type = 0x%8.8x (%s), data = ",
-                      this,
-                      m_broadcaster,
+                      static_cast<const void*>(this),
+                      static_cast<void*>(m_broadcaster),
                       m_broadcaster->GetBroadcasterName().GetCString(),
-                      m_type,
-                      event_name.GetString().c_str());
+                      m_type, event_name.GetString().c_str());
         else
             s->Printf("%p Event: broadcaster = %p (%s), type = 0x%8.8x, data = ",
-                      this,
-                      m_broadcaster,
-                      m_broadcaster->GetBroadcasterName().GetCString(),
-                      m_type);
+                      static_cast<const void*>(this),
+                      static_cast<void*>(m_broadcaster),
+                      m_broadcaster->GetBroadcasterName().GetCString(), m_type);
     }
     else
-        s->Printf("%p Event: broadcaster = NULL, type = 0x%8.8x, data = ", this, m_type);
+        s->Printf("%p Event: broadcaster = NULL, type = 0x%8.8x, data = ",
+                  static_cast<const void*>(this), m_type);
 
     if (m_data_ap.get() == NULL)
         s->Printf ("<NULL>");