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, 13 insertions, 19 deletions

diff --git a/source/Core/Broadcaster.cpp b/source/Core/Broadcaster.cpp
index 88f3996..dc37516 100644
--- a/source/Core/Broadcaster.cpp
+++ b/source/Core/Broadcaster.cpp
@@ -31,15 +31,16 @@ Broadcaster::Broadcaster (BroadcasterManager *manager, const char *name) :
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
     if (log)
-        log->Printf ("%p Broadcaster::Broadcaster(\"%s\")", this, m_broadcaster_name.AsCString());
-
+        log->Printf ("%p Broadcaster::Broadcaster(\"%s\")",
+                     static_cast<void*>(this), m_broadcaster_name.AsCString());
 }
 
 Broadcaster::~Broadcaster()
 {
     Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
     if (log)
-        log->Printf ("%p Broadcaster::~Broadcaster(\"%s\")", this, m_broadcaster_name.AsCString());
+        log->Printf ("%p Broadcaster::~Broadcaster(\"%s\")",
+                     static_cast<void*>(this), m_broadcaster_name.AsCString());
 
     Clear();
 }
@@ -226,7 +227,7 @@ Broadcaster::PrivateBroadcastEvent (EventSP &event_sp, bool unique)
     const uint32_t event_type = event_sp->GetType();
 
     Mutex::Locker event_types_locker(m_listeners_mutex);
-    
+
     Listener *hijacking_listener = NULL;
     if (!m_hijacking_listeners.empty())
     {
@@ -242,11 +243,9 @@ Broadcaster::PrivateBroadcastEvent (EventSP &event_sp, bool unique)
         StreamString event_description;
         event_sp->Dump  (&event_description);
         log->Printf ("%p Broadcaster(\"%s\")::BroadcastEvent (event_sp = {%s}, unique =%i) hijack = %p",
-                     this,
-                     m_broadcaster_name.AsCString(""),
-                     event_description.GetData(),
-                     unique,
-                     hijacking_listener);
+                     static_cast<void*>(this), m_broadcaster_name.AsCString(""),
+                     event_description.GetData(), unique,
+                     static_cast<void*>(hijacking_listener));
     }
 
     if (hijacking_listener)
@@ -293,16 +292,12 @@ bool
 Broadcaster::HijackBroadcaster (Listener *listener, uint32_t event_mask)
 {
     Mutex::Locker event_types_locker(m_listeners_mutex);
-    
+
     Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS));
     if (log)
-    {
         log->Printf ("%p Broadcaster(\"%s\")::HijackBroadcaster (listener(\"%s\")=%p)",
-                     this,
-                     m_broadcaster_name.AsCString(""),
-                     listener->m_name.c_str(),
-                     listener);
-    }
+                     static_cast<void*>(this), m_broadcaster_name.AsCString(""),
+                     listener->m_name.c_str(), static_cast<void*>(listener));
     m_hijacking_listeners.push_back(listener);
     m_hijacking_masks.push_back(event_mask);
     return true;
@@ -320,10 +315,9 @@ Broadcaster::RestoreBroadcaster ()
         {
             Listener *listener = m_hijacking_listeners.back();
             log->Printf ("%p Broadcaster(\"%s\")::RestoreBroadcaster (about to pop listener(\"%s\")=%p)",
-                         this,
+                         static_cast<void*>(this),
                          m_broadcaster_name.AsCString(""),
-                         listener->m_name.c_str(),
-                         listener);
+                         listener->m_name.c_str(), static_cast<void*>(listener));
         }
         m_hijacking_listeners.pop_back();
     }