From 8a00a562c5c93516ea2e1b45e7b37313a13ae0e5 Mon Sep 17 00:00:00 2001 From: Ilia K Date: Tue, 17 Mar 2015 16:54:52 +0000 Subject: [PATCH] Fix broadcasters for interpreter and process: # Fix CommandInterpreter.Broadcaster name (it should be the same as CommandInterpreter::GetStaticBroadcasterClass()) # Prevent the same error in Process.Broadcaster # Fix SBCommandInterpreter::GetBroadcasterClass (it should call CommandInterpreter::GetStaticBroadcasterClass(), was Communication::GetStaticBroadcasterClass()) llvm-svn: 232500 --- lldb/source/API/SBCommandInterpreter.cpp | 3 +-- lldb/source/Interpreter/CommandInterpreter.cpp | 2 +- lldb/source/Target/Process.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lldb/source/API/SBCommandInterpreter.cpp b/lldb/source/API/SBCommandInterpreter.cpp index 36e02b7edf08..8a5896872ca7 100644 --- a/lldb/source/API/SBCommandInterpreter.cpp +++ b/lldb/source/API/SBCommandInterpreter.cpp @@ -10,7 +10,6 @@ #include "lldb/lldb-python.h" #include "lldb/lldb-types.h" -#include "lldb/Core/Communication.h" #include "lldb/Core/SourceManager.h" #include "lldb/Core/Listener.h" #include "lldb/Interpreter/CommandInterpreter.h" @@ -533,7 +532,7 @@ SBCommandInterpreter::GetBroadcaster () const char * SBCommandInterpreter::GetBroadcasterClass () { - return Communication::GetStaticBroadcasterClass().AsCString(); + return CommandInterpreter::GetStaticBroadcasterClass().AsCString(); } const char * diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index dccf1f8e240f..eaa21adc1391 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -109,7 +109,7 @@ CommandInterpreter::CommandInterpreter ScriptLanguage script_language, bool synchronous_execution ) : - Broadcaster (&debugger, "lldb.command-interpreter"), + Broadcaster (&debugger, CommandInterpreter::GetStaticBroadcasterClass().AsCString()), Properties(OptionValuePropertiesSP(new OptionValueProperties(ConstString("interpreter")))), IOHandlerDelegate (IOHandlerDelegate::Completion::LLDBCommand), m_debugger (debugger), diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index ea9fc925ef85..3e129cbb7cae 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -704,7 +704,7 @@ Process::Process(Target &target, Listener &listener) : Process::Process(Target &target, Listener &listener, const UnixSignalsSP &unix_signals_sp) : ProcessProperties (this), UserID (LLDB_INVALID_PROCESS_ID), - Broadcaster (&(target.GetDebugger()), "lldb.process"), + Broadcaster (&(target.GetDebugger()), Process::GetStaticBroadcasterClass().AsCString()), m_target (target), m_public_state (eStateUnloaded), m_private_state (eStateUnloaded),