Index: source/Commands/CommandObjectBreakpoint.cpp =================================================================== --- source/Commands/CommandObjectBreakpoint.cpp +++ source/Commands/CommandObjectBreakpoint.cpp @@ -80,8 +80,8 @@ virtual ~CommandObjectBreakpointSet () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -123,8 +123,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -356,7 +356,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_condition.clear(); m_filenames.Clear(); @@ -388,7 +388,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -430,9 +430,9 @@ }; protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -857,8 +857,8 @@ virtual ~CommandObjectBreakpointModify () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -891,8 +891,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -993,7 +993,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_ignore_count = 0; m_thread_id = LLDB_INVALID_THREAD_ID; @@ -1013,7 +1013,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1045,8 +1045,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); if (target == NULL) @@ -1177,8 +1177,8 @@ ~CommandObjectBreakpointEnable () {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target == NULL) @@ -1297,8 +1297,8 @@ ~CommandObjectBreakpointDisable () {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target == NULL) @@ -1406,8 +1406,8 @@ virtual ~CommandObjectBreakpointList () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1426,8 +1426,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1458,7 +1458,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_level = lldb::eDescriptionLevelFull; m_internal = false; @@ -1466,7 +1466,7 @@ } const OptionDefinition * - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1484,8 +1484,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -1603,8 +1603,8 @@ virtual ~CommandObjectBreakpointClear () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1623,8 +1623,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1648,14 +1648,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_filename.clear(); m_line_num = 0; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1672,8 +1672,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target == NULL) @@ -1803,8 +1803,8 @@ virtual ~CommandObjectBreakpointDelete () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1823,8 +1823,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1848,14 +1848,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_dummy = false; m_force = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1870,8 +1870,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -1995,22 +1995,22 @@ { } - virtual uint32_t - GetNumDefinitions () + uint32_t + GetNumDefinitions () override { return sizeof (g_breakpoint_name_options) / sizeof (OptionDefinition); } - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_breakpoint_name_options; } - virtual Error + Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_value) + const char *option_value) override { Error error; const int short_option = g_breakpoint_name_options[option_idx].short_option; @@ -2038,8 +2038,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_name.Clear(); m_breakpoint.Clear(); @@ -2080,14 +2080,14 @@ ~CommandObjectBreakpointNameAdd () {} Options * - GetOptions () + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { if (!m_name_options.m_name.OptionWasSet()) { @@ -2176,14 +2176,14 @@ ~CommandObjectBreakpointNameDelete () {} Options * - GetOptions () + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { if (!m_name_options.m_name.OptionWasSet()) { @@ -2261,14 +2261,14 @@ ~CommandObjectBreakpointNameList () {} Options * - GetOptions () + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_name_options.m_use_dummy.GetCurrentValue()); Index: source/Commands/CommandObjectBreakpointCommand.cpp =================================================================== --- source/Commands/CommandObjectBreakpointCommand.cpp +++ source/Commands/CommandObjectBreakpointCommand.cpp @@ -181,14 +181,14 @@ virtual ~CommandObjectBreakpointCommandAdd () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { StreamFileSP output_sp(io_handler.GetOutputStreamFile()); if (output_sp) @@ -199,8 +199,8 @@ } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &line) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &line) override { io_handler.SetIsDone(true); @@ -318,8 +318,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -374,7 +374,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_commands = true; m_use_script_language = false; @@ -388,7 +388,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -412,8 +412,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -599,8 +599,8 @@ virtual ~CommandObjectBreakpointCommandDelete () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -618,8 +618,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -639,13 +639,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_dummy = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -659,8 +659,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -768,9 +768,9 @@ ~CommandObjectBreakpointCommandList () {} protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); Index: source/Commands/CommandObjectCommands.cpp =================================================================== --- source/Commands/CommandObjectCommands.cpp +++ source/Commands/CommandObjectCommands.cpp @@ -49,8 +49,8 @@ ~CommandObjectCommandsHistory () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -73,8 +73,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -109,7 +109,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_start_idx.Clear(); m_stop_idx.Clear(); @@ -118,7 +118,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -136,7 +136,7 @@ }; bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_clear.GetCurrentValue() && m_options.m_clear.OptionWasSet()) { @@ -261,13 +261,13 @@ ~CommandObjectCommandsSource () {} - virtual const char* - GetRepeatCommand (Args ¤t_command_args, uint32_t index) + const char* + GetRepeatCommand (Args ¤t_command_args, uint32_t index) override { return ""; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -275,7 +275,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -291,8 +291,8 @@ return matches.GetSize(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -314,8 +314,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -343,7 +343,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_stop_on_error.Clear(); m_silent_run.Clear(); @@ -351,7 +351,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -368,7 +368,7 @@ }; bool - DoExecute(Args& command, CommandReturnObject &result) + DoExecute(Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); if (argc == 1) @@ -558,8 +558,8 @@ } protected: - virtual bool - DoExecute (const char *raw_command_line, CommandReturnObject &result) + bool + DoExecute (const char *raw_command_line, CommandReturnObject &result) override { Args args (raw_command_line); std::string raw_command_string (raw_command_line); @@ -826,7 +826,7 @@ protected: bool - DoExecute (Args& args, CommandReturnObject &result) + DoExecute (Args& args, CommandReturnObject &result) override { CommandObject::CommandMap::iterator pos; CommandObject *cmd_obj; @@ -919,7 +919,7 @@ protected: bool - DoExecute (Args& args, CommandReturnObject &result) + DoExecute (Args& args, CommandReturnObject &result) override { CommandObject::CommandMap::iterator pos; @@ -1253,8 +1253,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1277,14 +1277,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_help.clear(); m_syntax.clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1368,8 +1368,8 @@ { } - virtual bool - IsRemovable () const + bool + IsRemovable () const override { return true; } @@ -1386,8 +1386,8 @@ return m_synchro; } - virtual const char * - GetHelpLong () + const char * + GetHelpLong () override { if (!m_fetched_help_long) { @@ -1404,8 +1404,8 @@ } protected: - virtual bool - DoExecute (const char *raw_command_line, CommandReturnObject &result) + bool + DoExecute (const char *raw_command_line, CommandReturnObject &result) override { ScriptInterpreter* scripter = m_interpreter.GetScriptInterpreter(); @@ -1475,8 +1475,8 @@ { } - virtual bool - IsRemovable () const + bool + IsRemovable () const override { return true; } @@ -1493,8 +1493,8 @@ return m_synchro; } - virtual const char * - GetHelp () + const char * + GetHelp () override { if (!m_fetched_help_short) { @@ -1510,8 +1510,8 @@ return CommandObjectRaw::GetHelp(); } - virtual const char * - GetHelpLong () + const char * + GetHelpLong () override { if (!m_fetched_help_long) { @@ -1528,8 +1528,8 @@ } protected: - virtual bool - DoExecute (const char *raw_command_line, CommandReturnObject &result) + bool + DoExecute (const char *raw_command_line, CommandReturnObject &result) override { ScriptInterpreter* scripter = m_interpreter.GetScriptInterpreter(); @@ -1596,7 +1596,7 @@ { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -1604,7 +1604,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -1620,8 +1620,8 @@ return matches.GetSize(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1640,8 +1640,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1660,13 +1660,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_allow_reload = true; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1681,7 +1681,7 @@ }; bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_interpreter.GetDebugger().GetScriptLanguage() != lldb::eScriptLanguagePython) { @@ -1776,8 +1776,8 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1800,8 +1800,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1834,7 +1834,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_class_name.clear(); m_funct_name.clear(); @@ -1843,7 +1843,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1860,8 +1860,8 @@ ScriptedCommandSynchronicity m_synchronicity; }; - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { StreamFileSP output_sp(io_handler.GetOutputStreamFile()); if (output_sp) @@ -1872,8 +1872,8 @@ } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &data) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &data) override { StreamFileSP error_sp = io_handler.GetErrorStreamFile(); @@ -1935,7 +1935,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_interpreter.GetDebugger().GetScriptLanguage() != lldb::eScriptLanguagePython) @@ -2069,7 +2069,7 @@ } bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_interpreter.GetHelp(result, @@ -2106,7 +2106,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_interpreter.RemoveAllUser(); @@ -2150,7 +2150,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { size_t argc = command.GetArgumentCount(); Index: source/Commands/CommandObjectFrame.cpp =================================================================== --- source/Commands/CommandObjectFrame.cpp +++ source/Commands/CommandObjectFrame.cpp @@ -77,7 +77,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_exe_ctx.GetFrameRef().DumpUsingSettingsFormat (&result.GetOutputStream()); result.SetStatus (eReturnStatusSuccessFinishResult); @@ -110,8 +110,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; bool success = false; @@ -133,13 +133,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { relative_frame_offset = INT32_MIN; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -179,9 +179,8 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -189,7 +188,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { // No need to check "thread" for validity as eCommandRequiresThread ensures it is valid Thread *thread = m_exe_ctx.GetThreadPtr(); @@ -347,15 +346,14 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_option_group; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -363,7 +361,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { // Arguments are the standard source file completer. std::string completion_str (input.GetArgumentAtIndex(cursor_index)); @@ -381,8 +379,8 @@ } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { // No need to check "frame" for validity as eCommandRequiresFrame ensures it is valid StackFrame *frame = m_exe_ctx.GetFramePtr(); Index: source/Commands/CommandObjectLog.cpp =================================================================== --- source/Commands/CommandObjectLog.cpp +++ source/Commands/CommandObjectLog.cpp @@ -83,7 +83,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -127,8 +127,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -154,14 +154,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { log_file.Clear(); log_options = 0; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -177,9 +177,9 @@ }; protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { if (args.GetArgumentCount() < 2) { @@ -266,9 +266,9 @@ } protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { const size_t argc = args.GetArgumentCount(); if (argc == 0) @@ -338,9 +338,9 @@ } protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { const size_t argc = args.GetArgumentCount(); if (argc == 0) @@ -402,9 +402,9 @@ } protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { const size_t argc = args.GetArgumentCount(); result.SetStatus(eReturnStatusFailed); Index: source/Commands/CommandObjectMemory.cpp =================================================================== --- source/Commands/CommandObjectMemory.cpp +++ source/Commands/CommandObjectMemory.cpp @@ -73,22 +73,22 @@ } - virtual uint32_t - GetNumDefinitions () + uint32_t + GetNumDefinitions () override { return sizeof (g_option_table) / sizeof (OptionDefinition); } - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_option_table; } - virtual Error + Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_arg) + const char *option_arg) override { Error error; const int short_option = g_option_table[option_idx].short_option; @@ -120,8 +120,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_num_per_line.Clear(); m_output_as_binary = false; @@ -373,19 +373,19 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } - virtual const char *GetRepeatCommand (Args ¤t_command_args, uint32_t index) + const char *GetRepeatCommand (Args ¤t_command_args, uint32_t index) override { return m_cmd_name.c_str(); } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { // No need to check "target" for validity as eCommandRequiresTarget ensures it is valid Target *target = m_exe_ctx.GetTargetPtr(); @@ -971,22 +971,22 @@ { } - virtual uint32_t - GetNumDefinitions () + uint32_t + GetNumDefinitions () override { return sizeof (g_memory_find_option_table) / sizeof (OptionDefinition); } - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_memory_find_option_table; } - virtual Error + Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_arg) + const char *option_arg) override { Error error; const int short_option = g_memory_find_option_table[option_idx].short_option; @@ -1018,8 +1018,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_expr.Clear(); m_string.Clear(); @@ -1074,14 +1074,14 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { // No need to check "process" for validity as eCommandRequiresProcess ensures it is valid Process *process = m_exe_ctx.GetProcessPtr(); @@ -1263,22 +1263,22 @@ { } - virtual uint32_t - GetNumDefinitions () + uint32_t + GetNumDefinitions () override { return sizeof (g_memory_write_option_table) / sizeof (OptionDefinition); } - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_memory_write_option_table; } - virtual Error + Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_arg) + const char *option_arg) override { Error error; const int short_option = g_memory_write_option_table[option_idx].short_option; @@ -1312,8 +1312,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_infile.Clear(); m_infile_offset = 0; @@ -1369,7 +1369,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } @@ -1402,8 +1402,8 @@ } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { // No need to check "process" for validity as eCommandRequiresProcess ensures it is valid Process *process = m_exe_ctx.GetProcessPtr(); @@ -1716,14 +1716,14 @@ { } - virtual const char *GetRepeatCommand (Args ¤t_command_args, uint32_t index) + const char *GetRepeatCommand (Args ¤t_command_args, uint32_t index) override { return m_cmd_name.c_str(); } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); Index: source/Commands/CommandObjectPlatform.cpp =================================================================== --- source/Commands/CommandObjectPlatform.cpp +++ source/Commands/CommandObjectPlatform.cpp @@ -91,10 +91,10 @@ { } - virtual lldb_private::Error + lldb_private::Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_arg) + const char *option_arg) override { Error error; char short_option = (char) GetDefinitions()[option_idx].short_option; @@ -155,19 +155,19 @@ } void - OptionParsingStarting (CommandInterpreter &interpreter) + OptionParsingStarting (CommandInterpreter &interpreter) override { m_permissions = 0; } - virtual uint32_t - GetNumDefinitions () + uint32_t + GetNumDefinitions () override { return llvm::array_lengthof(g_permissions_options); } const lldb_private::OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_permissions_options; } @@ -203,14 +203,14 @@ { } - virtual int + int HandleCompletion (Args &input, int &cursor_index, int &cursor_char_position, int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -225,15 +225,15 @@ return matches.GetSize(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { if (args.GetArgumentCount() == 1) { @@ -297,8 +297,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Stream &ostrm = result.GetOutputStream(); ostrm.Printf("Available platforms:\n"); @@ -352,8 +352,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Stream &ostrm = result.GetOutputStream(); @@ -402,8 +402,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Stream &ostrm = result.GetOutputStream(); @@ -430,8 +430,8 @@ return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); OptionGroupOptions* m_platform_options = NULL; @@ -467,8 +467,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -549,8 +549,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -566,8 +566,8 @@ return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { if (m_options.DidFinalize() == false) m_options.Finalize(); @@ -602,8 +602,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -635,8 +635,8 @@ return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { if (m_options.DidFinalize() == false) { @@ -670,8 +670,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -708,8 +708,8 @@ } return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { if (m_options.DidFinalize() == false) { @@ -741,8 +741,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -793,8 +793,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -816,8 +816,8 @@ } return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -837,8 +837,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; char short_option = (char) m_getopt_table[option_idx].val; @@ -866,14 +866,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_offset = 0; m_count = 1; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -919,8 +919,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -944,8 +944,8 @@ } return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -965,8 +965,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; char short_option = (char) m_getopt_table[option_idx].val; @@ -992,14 +992,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_offset = 0; m_data.clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1099,8 +1099,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { // If the number of arguments is incorrect, issue an error message. if (args.GetArgumentCount() != 2) @@ -1177,8 +1177,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { // If the number of arguments is incorrect, issue an error message. if (args.GetArgumentCount() != 1) @@ -1233,8 +1233,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { const char* src = args.GetArgumentAtIndex(0); const char* dst = args.GetArgumentAtIndex(1); @@ -1286,15 +1286,15 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); PlatformSP platform_sp; @@ -1403,15 +1403,15 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); PlatformSP platform_sp; @@ -1529,8 +1529,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1620,7 +1620,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { match_info.Clear(); show_args = false; @@ -1628,7 +1628,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1704,8 +1704,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); PlatformSP platform_sp; @@ -1798,7 +1798,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; char short_option = (char) m_getopt_table[option_idx].val; @@ -1839,18 +1839,18 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { attach_info.Clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } - virtual bool + bool HandleOptionArgumentCompletion (Args &input, int cursor_index, int char_pos, @@ -1859,7 +1859,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { int opt_arg_pos = opt_element_vector[opt_element_index].opt_arg_pos; int opt_defs_index = opt_element_vector[opt_element_index].opt_defs_index; @@ -1927,7 +1927,7 @@ bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -1957,7 +1957,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -2038,15 +2038,15 @@ return 1; } - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_option_table; } - virtual Error + Error SetOptionValue (uint32_t option_idx, - const char *option_value) + const char *option_value) override { Error error; @@ -2070,8 +2070,8 @@ return error; } - virtual void - OptionParsingStarting () + void + OptionParsingStarting () override { } @@ -2096,15 +2096,14 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } - virtual bool - DoExecute (const char *raw_command_line, CommandReturnObject &result) + bool + DoExecute (const char *raw_command_line, CommandReturnObject &result) override { m_options.NotifyOptionParsingStarting(); @@ -2223,8 +2222,8 @@ { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { if (args.GetArgumentCount() != 2) { Index: source/Commands/CommandObjectPlugin.cpp =================================================================== --- source/Commands/CommandObjectPlugin.cpp +++ source/Commands/CommandObjectPlugin.cpp @@ -53,7 +53,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -71,7 +71,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { size_t argc = command.GetArgumentCount(); Index: source/Commands/CommandObjectProcess.cpp =================================================================== --- source/Commands/CommandObjectProcess.cpp +++ source/Commands/CommandObjectProcess.cpp @@ -146,7 +146,7 @@ { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -154,7 +154,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -171,12 +171,12 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } - virtual const char *GetRepeatCommand (Args ¤t_command_args, uint32_t index) + const char *GetRepeatCommand (Args ¤t_command_args, uint32_t index) override { // No repeat for "process launch"... return ""; @@ -184,7 +184,7 @@ protected: bool - DoExecute (Args& launch_args, CommandReturnObject &result) + DoExecute (Args& launch_args, CommandReturnObject &result) override { Debugger &debugger = m_interpreter.GetDebugger(); Target *target = debugger.GetSelectedTarget().get(); @@ -343,7 +343,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -392,18 +392,18 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { attach_info.Clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } - virtual bool + bool HandleOptionArgumentCompletion (Args &input, int cursor_index, int char_pos, @@ -412,7 +412,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { int opt_arg_pos = opt_element_vector[opt_element_index].opt_arg_pos; int opt_defs_index = opt_element_vector[opt_element_index].opt_defs_index; @@ -481,15 +481,14 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); @@ -668,7 +667,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -689,13 +688,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_ignore = 0; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -708,7 +707,7 @@ }; bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); bool synchronous_execution = m_interpreter.GetSynchronous (); @@ -807,7 +806,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -847,7 +846,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -876,13 +875,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_keep_stopped = eLazyBoolCalculate; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -912,7 +911,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -920,7 +919,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); // FIXME: This will be a Command Option: @@ -987,7 +986,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1006,13 +1005,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { plugin_name.clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1042,15 +1041,14 @@ Options * - GetOptions () + GetOptions () override { return &m_options; } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { TargetSP target_sp (m_interpreter.GetDebugger().GetSelectedTarget()); @@ -1156,8 +1154,8 @@ { } - virtual CommandObject * - GetProxyCommandObject() + CommandObject * + GetProxyCommandObject() override { Process *process = m_interpreter.GetExecutionContext().GetProcessPtr(); if (process) @@ -1194,8 +1192,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); @@ -1251,8 +1248,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); @@ -1324,8 +1320,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); @@ -1396,8 +1391,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); if (process == NULL) @@ -1458,8 +1452,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); if (process == NULL) @@ -1520,7 +1513,7 @@ protected: bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { ProcessSP process_sp = m_exe_ctx.GetProcessSP(); if (process_sp) @@ -1581,7 +1574,7 @@ bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -1625,7 +1618,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1649,7 +1642,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { stop.clear(); notify.clear(); @@ -1657,7 +1650,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1699,7 +1692,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1781,7 +1774,7 @@ protected: bool - DoExecute (Args &signal_args, CommandReturnObject &result) + DoExecute (Args &signal_args, CommandReturnObject &result) override { TargetSP target_sp = m_interpreter.GetDebugger().GetSelectedTarget(); Index: source/Commands/CommandObjectRegister.cpp =================================================================== --- source/Commands/CommandObjectRegister.cpp +++ source/Commands/CommandObjectRegister.cpp @@ -80,7 +80,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } @@ -170,8 +170,8 @@ } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); RegisterContext *reg_ctx = m_exe_ctx.GetRegisterContext (); @@ -277,27 +277,27 @@ } - virtual uint32_t - GetNumDefinitions (); + uint32_t + GetNumDefinitions () override; - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_option_table; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { set_indexes.Clear(); dump_all_sets.Clear(); alternate_name.Clear(); } - virtual Error + Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_value) + const char *option_value) override { Error error; const int short_option = g_option_table[option_idx].short_option; @@ -410,8 +410,8 @@ } protected: - virtual bool - DoExecute(Args& command, CommandReturnObject &result) + bool + DoExecute(Args& command, CommandReturnObject &result) override { DataExtractor reg_data; RegisterContext *reg_ctx = m_exe_ctx.GetRegisterContext (); Index: source/Commands/CommandObjectSettings.cpp =================================================================== --- source/Commands/CommandObjectSettings.cpp +++ source/Commands/CommandObjectSettings.cpp @@ -87,11 +87,11 @@ ~CommandObjectSettingsSet () {} // Overrides base class's behavior where WantsCompletion = !WantsRawCommandString. - virtual bool - WantsCompletion() { return true; } + bool + WantsCompletion() override { return true; } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -109,8 +109,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -129,13 +129,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_global = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -149,7 +149,7 @@ bool m_global; }; - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -157,7 +157,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -215,8 +215,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { Args cmd_args(command); @@ -325,7 +325,7 @@ ~CommandObjectSettingsShow () {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -333,7 +333,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -349,8 +349,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -417,7 +417,7 @@ virtual ~CommandObjectSettingsList () {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -425,7 +425,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -441,8 +441,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -524,7 +524,7 @@ virtual ~CommandObjectSettingsRemove () {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -532,7 +532,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -551,8 +551,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -656,10 +656,10 @@ ~CommandObjectSettingsReplace () {} // Overrides base class's behavior where WantsCompletion = !WantsRawCommandString. - virtual bool - WantsCompletion() { return true; } + bool + WantsCompletion() override { return true; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -667,7 +667,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -686,8 +686,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -777,10 +777,10 @@ ~CommandObjectSettingsInsertBefore () {} // Overrides base class's behavior where WantsCompletion = !WantsRawCommandString. - virtual bool - WantsCompletion() { return true; } + bool + WantsCompletion() override { return true; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -788,7 +788,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -807,8 +807,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -901,10 +901,10 @@ ~CommandObjectSettingsInsertAfter () {} // Overrides base class's behavior where WantsCompletion = !WantsRawCommandString. - virtual bool - WantsCompletion() { return true; } + bool + WantsCompletion() override { return true; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -912,7 +912,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -931,8 +931,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -1015,10 +1015,10 @@ ~CommandObjectSettingsAppend () {} // Overrides base class's behavior where WantsCompletion = !WantsRawCommandString. - virtual bool - WantsCompletion() { return true; } + bool + WantsCompletion() override { return true; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -1026,7 +1026,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -1045,8 +1045,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); Args cmd_args(command); @@ -1120,7 +1120,7 @@ virtual ~CommandObjectSettingsClear () {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -1128,7 +1128,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex (cursor_index), cursor_char_position); @@ -1147,8 +1147,8 @@ } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); const size_t argc = command.GetArgumentCount (); Index: source/Commands/CommandObjectSource.cpp =================================================================== --- source/Commands/CommandObjectSource.cpp +++ source/Commands/CommandObjectSource.cpp @@ -54,7 +54,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = g_option_table[option_idx].short_option; @@ -79,7 +79,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { file_spec.Clear(); file_name.clear(); @@ -87,7 +87,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -116,14 +116,14 @@ Options * - GetOptions () + GetOptions () override { return &m_options; } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { result.AppendError ("Not yet implemented"); result.SetStatus (eReturnStatusFailed); @@ -162,7 +162,7 @@ } Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = g_option_table[option_idx].short_option; @@ -213,7 +213,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { file_spec.Clear(); file_name.clear(); @@ -227,7 +227,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -262,13 +262,13 @@ Options * - GetOptions () + GetOptions () override { return &m_options; } - virtual const char * - GetRepeatCommand (Args ¤t_command_args, uint32_t index) + const char * + GetRepeatCommand (Args ¤t_command_args, uint32_t index) override { // This is kind of gross, but the command hasn't been parsed yet so we can't look at the option // values for this invocation... I have to scan the arguments directly. @@ -507,7 +507,7 @@ } bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); Index: source/Commands/CommandObjectTarget.cpp =================================================================== --- source/Commands/CommandObjectTarget.cpp +++ source/Commands/CommandObjectTarget.cpp @@ -192,12 +192,12 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -205,7 +205,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -223,7 +223,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); FileSpec core_file (m_core_file.GetOptionValue().GetCurrentValue()); @@ -483,8 +483,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { if (args.GetArgumentCount() == 0) { @@ -531,8 +531,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { if (args.GetArgumentCount() == 1) { @@ -628,14 +628,14 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { const size_t argc = args.GetArgumentCount(); std::vector delete_target_list; @@ -850,7 +850,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } @@ -896,8 +896,8 @@ } } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Target *target = m_exe_ctx.GetTargetPtr(); const size_t argc = args.GetArgumentCount(); @@ -1140,8 +1140,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1213,8 +1212,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1283,8 +1281,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1372,8 +1369,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1429,8 +1425,7 @@ protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -2067,7 +2062,7 @@ { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -2075,7 +2070,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { // Arguments are the standard module completer. std::string completion_str (input.GetArgumentAtIndex(cursor_index)); @@ -2129,7 +2124,7 @@ { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -2137,7 +2132,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { // Arguments are the standard source file completer. std::string completion_str (input.GetArgumentAtIndex(cursor_index)); @@ -2176,8 +2171,8 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2196,8 +2191,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -2220,13 +2215,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_sort_order = eSortOrderNone; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2238,9 +2233,8 @@ }; protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target == NULL) @@ -2371,9 +2365,8 @@ } protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target == NULL) @@ -2477,9 +2470,8 @@ } protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target == NULL) @@ -2580,9 +2572,8 @@ } protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) { Target *target = m_exe_ctx.GetTargetPtr(); uint32_t total_num_dumped = 0; @@ -2690,13 +2681,13 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -2704,7 +2695,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -2725,9 +2716,8 @@ OptionGroupUUID m_uuid_option_group; OptionGroupFile m_symbol_file; - virtual bool - DoExecute (Args& args, - CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target == NULL) @@ -2893,16 +2883,15 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (Args& args, - CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target == NULL) @@ -3150,8 +3139,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; @@ -3176,7 +3165,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_format_array.clear(); m_use_global_module_list = false; @@ -3184,7 +3173,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3214,17 +3203,15 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); const bool use_global_module_list = m_options.m_use_global_module_list; @@ -3595,8 +3582,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; @@ -3631,7 +3618,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_type = eLookupTypeInvalid; m_str.clear(); @@ -3639,7 +3626,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3673,17 +3660,15 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_exe_ctx.GetTargetPtr(); Process *process = m_exe_ctx.GetProcessPtr(); @@ -3910,8 +3895,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; @@ -3988,7 +3973,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_type = eLookupTypeInvalid; m_str.clear(); @@ -4003,7 +3988,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -4050,8 +4035,8 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -4205,9 +4190,8 @@ } protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target == NULL) @@ -4425,7 +4409,7 @@ { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -4433,7 +4417,7 @@ int match_start_point, int max_return_elements, bool &word_complete, - StringList &matches) + StringList &matches) override { std::string completion_str (input.GetArgumentAtIndex(cursor_index)); completion_str.erase (cursor_char_position); @@ -4449,8 +4433,8 @@ return matches.GetSize(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } @@ -4628,9 +4612,8 @@ return false; } - virtual bool - DoExecute (Args& args, - CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Target *target = m_exe_ctx.GetTargetPtr(); result.SetStatus (eReturnStatusFailed); @@ -4891,13 +4874,13 @@ ~CommandOptions () {} const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -4984,7 +4967,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_class_name.clear(); m_function_name.clear(); @@ -5029,7 +5012,7 @@ }; Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -5049,8 +5032,8 @@ } protected: - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { StreamFileSP output_sp(io_handler.GetOutputStreamFile()); if (output_sp) @@ -5060,8 +5043,8 @@ } } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &line) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &line) override { if (m_stop_hook_sp) { @@ -5093,7 +5076,7 @@ } bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_stop_hook_sp.reset(); @@ -5247,7 +5230,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target) @@ -5323,7 +5306,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target) @@ -5393,7 +5376,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (!target) Index: source/Commands/CommandObjectThread.cpp =================================================================== --- source/Commands/CommandObjectThread.cpp +++ source/Commands/CommandObjectThread.cpp @@ -59,8 +59,8 @@ } virtual ~CommandObjectIterateOverThreads() {} - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { result.SetStatus (m_success_return); @@ -167,8 +167,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -211,7 +211,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_count = UINT32_MAX; m_start = 0; @@ -219,7 +219,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -252,8 +252,8 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -285,8 +285,8 @@ } } - virtual bool - HandleOneThread (Thread &thread, CommandReturnObject &result) + bool + HandleOneThread (Thread &thread, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); @@ -348,8 +348,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -426,7 +426,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_step_in_avoid_no_debug = eLazyBoolCalculate; m_step_out_avoid_no_debug = eLazyBoolCalculate; @@ -444,7 +444,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -498,16 +498,15 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); bool synchronous_execution = m_interpreter.GetSynchronous(); @@ -785,8 +784,8 @@ { } - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { bool synchronous_execution = m_interpreter.GetSynchronous (); @@ -985,8 +984,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1042,7 +1041,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_thread_idx = LLDB_INVALID_THREAD_ID; m_frame_idx = 0; @@ -1051,7 +1050,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1098,16 +1097,15 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { bool synchronous_execution = m_interpreter.GetSynchronous (); @@ -1377,8 +1375,8 @@ } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); if (process == NULL) @@ -1440,7 +1438,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -1492,7 +1490,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_json_thread = false; m_json_stopinfo = false; @@ -1503,8 +1501,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { const int short_option = m_getopt_table[option_idx].val; Error error; @@ -1527,7 +1525,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1538,9 +1536,8 @@ static OptionDefinition g_option_table[]; }; - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1551,8 +1548,8 @@ { } - virtual bool - HandleOneThread (Thread &thread, CommandReturnObject &result) + bool + HandleOneThread (Thread &thread, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); if (!thread.GetDescription (strm, eDescriptionLevelFull, m_options.m_json_thread, m_options.m_json_stopinfo)) @@ -1602,8 +1599,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1631,13 +1628,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_from_expression = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1651,9 +1648,8 @@ // Instance variables to hold the values for command options. }; - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1692,11 +1688,8 @@ protected: - bool DoExecute - ( - const char *command, - CommandReturnObject &result - ) + bool + DoExecute (const char *command, CommandReturnObject &result) override { // I am going to handle this by hand, because I don't want you to have to say: // "thread return -- -5". @@ -1810,7 +1803,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_filenames.Clear(); m_line_num = 0; @@ -1824,8 +1817,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { bool success; const int short_option = m_getopt_table[option_idx].val; @@ -1866,7 +1859,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1880,9 +1873,8 @@ static OptionDefinition g_option_table[]; }; - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1906,7 +1898,7 @@ protected: - bool DoExecute (Args& args, CommandReturnObject &result) + bool DoExecute (Args& args, CommandReturnObject &result) override { RegisterContext *reg_ctx = m_exe_ctx.GetRegisterContext(); StackFrame *frame = m_exe_ctx.GetFramePtr(); @@ -2022,8 +2014,8 @@ { } - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -2049,14 +2041,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_verbose = false; m_internal = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2089,15 +2081,15 @@ { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } protected: - virtual bool - HandleOneThread (Thread &thread, CommandReturnObject &result) + bool + HandleOneThread (Thread &thread, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); DescriptionLevel desc_level = eDescriptionLevelFull; @@ -2151,7 +2143,7 @@ virtual ~CommandObjectThreadPlanDiscard () {} bool - DoExecute (Args& args, CommandReturnObject &result) + DoExecute (Args& args, CommandReturnObject &result) override { Thread *thread = m_exe_ctx.GetThreadPtr(); if (args.GetArgumentCount() != 1) Index: source/Commands/CommandObjectType.cpp =================================================================== --- source/Commands/CommandObjectType.cpp +++ source/Commands/CommandObjectType.cpp @@ -150,14 +150,14 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg); + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override; void - OptionParsingStarting (); + OptionParsingStarting () override; const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -180,8 +180,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -207,8 +207,8 @@ { } - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { static const char *g_summary_addreader_instructions = "Enter your Python command(s). Type 'DONE' to end.\n" "def function (valobj,internal_dict):\n" @@ -224,8 +224,8 @@ } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &data) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &data) override { StreamFileSP error_sp = io_handler.GetErrorStreamFile(); @@ -356,7 +356,7 @@ Error* error = NULL); protected: bool - DoExecute (Args& command, CommandReturnObject &result); + DoExecute (Args& command, CommandReturnObject &result) override; }; @@ -389,8 +389,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -431,7 +431,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_cascade = true; m_class_name = ""; @@ -444,7 +444,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -472,8 +472,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -486,7 +486,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { WarnOnPotentialUnquotedUnsignedType(command, result); @@ -502,8 +502,8 @@ } } - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { StreamFileSP output_sp(io_handler.GetOutputStreamFile()); if (output_sp) @@ -514,8 +514,8 @@ } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &data) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &data) override { StreamFileSP error_sp = io_handler.GetErrorStreamFile(); @@ -664,17 +664,17 @@ { } - virtual uint32_t - GetNumDefinitions (); + uint32_t + GetNumDefinitions () override; - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_option_table; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_cascade = true; m_skip_pointers = false; @@ -683,10 +683,10 @@ m_category.assign("default"); m_custom_type_name.clear(); } - virtual Error + Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_value) + const char *option_value) override { Error error; const int short_option = g_option_table[option_idx].short_option; @@ -740,8 +740,8 @@ OptionGroupFormat m_format_options; CommandOptions m_command_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } @@ -815,7 +815,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -929,8 +929,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -952,14 +952,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -977,8 +977,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1018,7 +1018,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -1096,8 +1096,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1116,13 +1116,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1139,8 +1139,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1171,7 +1171,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) DataVisualization::Categories::LoopThrough(PerCategoryCallback, NULL); @@ -1235,8 +1235,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1255,13 +1255,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1278,8 +1278,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1309,7 +1309,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -1953,8 +1953,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -1976,14 +1976,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2001,8 +2001,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2042,7 +2042,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2116,8 +2116,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -2136,13 +2136,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2159,8 +2159,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2191,7 +2191,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) @@ -2260,8 +2260,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -2280,13 +2280,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2303,8 +2303,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2334,7 +2334,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2474,8 +2474,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -2497,14 +2497,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_define_enabled.Clear(); m_cate_language.Clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2523,8 +2523,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2555,7 +2555,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2610,8 +2610,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -2635,13 +2635,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_language = lldb::eLanguageTypeUnknown; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2658,8 +2658,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2690,7 +2690,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2778,7 +2778,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2838,8 +2838,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -2863,13 +2863,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_language = lldb::eLanguageTypeUnknown; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2886,8 +2886,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2918,7 +2918,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3029,7 +3029,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); RegularExpression* regex = NULL; @@ -3093,8 +3093,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -3113,13 +3113,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3136,8 +3136,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3167,7 +3167,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3306,8 +3306,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -3326,13 +3326,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3349,8 +3349,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3380,7 +3380,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3503,8 +3503,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -3526,14 +3526,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3551,8 +3551,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3591,7 +3591,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3669,8 +3669,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -3692,14 +3692,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3717,8 +3717,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3757,7 +3757,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3836,8 +3836,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -3856,13 +3856,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3879,8 +3879,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3910,7 +3910,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) @@ -3965,8 +3965,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -3985,13 +3985,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -4008,8 +4008,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -4039,7 +4039,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) @@ -4276,8 +4276,8 @@ virtual ~CommandOptions (){} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -4315,7 +4315,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_cascade = true; m_skip_pointers = false; @@ -4327,7 +4327,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -4354,8 +4354,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -4473,7 +4473,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -4578,22 +4578,22 @@ virtual ~CommandOptions () {} - virtual uint32_t - GetNumDefinitions () + uint32_t + GetNumDefinitions () override { return 3; } - virtual const OptionDefinition* - GetDefinitions () + const OptionDefinition* + GetDefinitions () override { return g_option_table; } - virtual Error + Error SetOptionValue (CommandInterpreter &interpreter, uint32_t option_idx, - const char *option_value) + const char *option_value) override { Error error; @@ -4617,8 +4617,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_show_help = false; m_language = eLanguageTypeUnknown; @@ -4654,15 +4654,14 @@ { } - virtual Options * - GetOptions () + GetOptions () override { return &m_option_group; } - virtual bool - DoExecute (const char *raw_command_line, CommandReturnObject &result) + bool + DoExecute (const char *raw_command_line, CommandReturnObject &result) override { if (!raw_command_line || !raw_command_line[0]) { @@ -4803,8 +4802,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { auto target_sp = m_interpreter.GetDebugger().GetSelectedTarget(); auto frame_sp = target_sp->GetProcessSP()->GetThreadList().GetSelectedThread()->GetSelectedFrame(); Index: source/Commands/CommandObjectWatchpoint.cpp =================================================================== --- source/Commands/CommandObjectWatchpoint.cpp +++ source/Commands/CommandObjectWatchpoint.cpp @@ -181,8 +181,8 @@ virtual ~CommandObjectWatchpointList () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -200,8 +200,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -226,13 +226,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_level = lldb::eDescriptionLevelFull; } const OptionDefinition * - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -248,8 +248,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target == NULL) @@ -365,9 +365,9 @@ ~CommandObjectWatchpointEnable () {} protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (!CheckTargetForWatchpointOperations(target, result)) @@ -445,8 +445,8 @@ ~CommandObjectWatchpointDisable () {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (!CheckTargetForWatchpointOperations(target, result)) @@ -528,8 +528,8 @@ ~CommandObjectWatchpointDelete () {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (!CheckTargetForWatchpointOperations(target, result)) @@ -610,8 +610,8 @@ virtual ~CommandObjectWatchpointIgnore () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -629,8 +629,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -653,13 +653,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_ignore_count = 0; } const OptionDefinition * - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -675,9 +675,9 @@ }; protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (!CheckTargetForWatchpointOperations(target, result)) @@ -766,8 +766,8 @@ virtual ~CommandObjectWatchpointModify () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -786,8 +786,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -810,14 +810,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_condition.clear(); m_condition_passed = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -833,8 +833,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (!CheckTargetForWatchpointOperations(target, result)) @@ -961,8 +961,8 @@ virtual ~CommandObjectWatchpointSetVariable () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } @@ -983,8 +983,8 @@ return 0; } - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); StackFrame *frame = m_exe_ctx.GetFramePtr(); @@ -1173,18 +1173,18 @@ ~CommandObjectWatchpointSetExpression () {} // Overrides base class's behavior where WantsCompletion = !WantsRawCommandString. - virtual bool - WantsCompletion() { return true; } + bool + WantsCompletion() override { return true; } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } protected: - virtual bool - DoExecute (const char *raw_command, CommandReturnObject &result) + bool + DoExecute (const char *raw_command, CommandReturnObject &result) override { m_option_group.NotifyOptionParsingStarting(); // This is a raw command, so notify the option group Index: source/Commands/CommandObjectWatchpointCommand.cpp =================================================================== --- source/Commands/CommandObjectWatchpointCommand.cpp +++ source/Commands/CommandObjectWatchpointCommand.cpp @@ -172,14 +172,14 @@ virtual ~CommandObjectWatchpointCommandAdd () {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { StreamFileSP output_sp(io_handler.GetOutputStreamFile()); if (output_sp) @@ -190,8 +190,8 @@ } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &line) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &line) override { io_handler.SetIsDone(true); @@ -304,8 +304,8 @@ virtual ~CommandOptions () {} - virtual Error - SetOptionValue (uint32_t option_idx, const char *option_arg) + Error + SetOptionValue (uint32_t option_idx, const char *option_arg) override { Error error; const int short_option = m_getopt_table[option_idx].val; @@ -356,7 +356,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_commands = true; m_use_script_language = false; @@ -369,7 +369,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -392,8 +392,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); @@ -554,8 +554,8 @@ ~CommandObjectWatchpointCommandDelete () {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); @@ -645,9 +645,8 @@ ~CommandObjectWatchpointCommandList () {} protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get();