Index: lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp +++ lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp @@ -77,11 +77,10 @@ } - virtual - ~CommandObjectBreakpointSet () {} + ~CommandObjectBreakpointSet () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -120,11 +119,10 @@ } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +354,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_condition.clear(); m_filenames.Clear(); @@ -388,7 +386,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -430,9 +428,9 @@ }; protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -854,11 +852,10 @@ } - virtual - ~CommandObjectBreakpointModify () {} + ~CommandObjectBreakpointModify () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -888,11 +885,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +989,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_ignore_count = 0; m_thread_id = LLDB_INVALID_THREAD_ID; @@ -1013,7 +1009,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1045,8 +1041,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) @@ -1173,12 +1169,11 @@ } - virtual - ~CommandObjectBreakpointEnable () {} + ~CommandObjectBreakpointEnable () override {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target == NULL) @@ -1293,12 +1288,11 @@ } - virtual - ~CommandObjectBreakpointDisable () {} + ~CommandObjectBreakpointDisable () override {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target == NULL) @@ -1403,11 +1397,10 @@ } - virtual - ~CommandObjectBreakpointList () {} + ~CommandObjectBreakpointList () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1423,11 +1416,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +1450,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_level = lldb::eDescriptionLevelFull; m_internal = false; @@ -1466,7 +1458,7 @@ } const OptionDefinition * - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1484,8 +1476,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -1600,11 +1592,10 @@ { } - virtual - ~CommandObjectBreakpointClear () {} + ~CommandObjectBreakpointClear () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1620,11 +1611,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +1638,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_filename.clear(); m_line_num = 0; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1672,8 +1662,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target == NULL) @@ -1800,11 +1790,10 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectBreakpointDelete () {} + ~CommandObjectBreakpointDelete () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1820,11 +1809,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +1836,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_dummy = false; m_force = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1870,8 +1858,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -1990,27 +1978,26 @@ } - virtual - ~BreakpointNameOptionGroup () + ~BreakpointNameOptionGroup () override { } - 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 +2025,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_name.Clear(); m_breakpoint.Clear(); @@ -2076,18 +2063,17 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectBreakpointNameAdd () {} + ~CommandObjectBreakpointNameAdd () override {} 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()) { @@ -2172,18 +2158,17 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectBreakpointNameDelete () {} + ~CommandObjectBreakpointNameDelete () override {} 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()) { @@ -2257,18 +2242,17 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectBreakpointNameList () {} + ~CommandObjectBreakpointNameList () override {} 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()); @@ -2353,8 +2337,7 @@ } - virtual - ~CommandObjectBreakpointName () + ~CommandObjectBreakpointName () override { } Index: lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp +++ lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp @@ -178,17 +178,16 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectBreakpointCommandAdd () {} + ~CommandObjectBreakpointCommandAdd () override {} - 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 +198,8 @@ } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &line) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &line) override { io_handler.SetIsDone(true); @@ -315,11 +314,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +372,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_commands = true; m_use_script_language = false; @@ -388,7 +386,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -412,8 +410,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -596,11 +594,10 @@ } - virtual - ~CommandObjectBreakpointCommandDelete () {} + ~CommandObjectBreakpointCommandDelete () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -615,11 +612,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +635,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_dummy = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -659,8 +655,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(m_options.m_use_dummy); @@ -764,13 +760,12 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectBreakpointCommandList () {} + ~CommandObjectBreakpointCommandList () override {} protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); Index: lldb/trunk/source/Commands/CommandObjectBugreport.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectBugreport.cpp +++ lldb/trunk/source/Commands/CommandObjectBugreport.cpp @@ -43,7 +43,7 @@ m_option_group.Finalize(); } - ~CommandObjectBugreportUnwind() + ~CommandObjectBugreportUnwind() override { } Index: lldb/trunk/source/Commands/CommandObjectCommands.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectCommands.cpp +++ lldb/trunk/source/Commands/CommandObjectCommands.cpp @@ -47,10 +47,10 @@ { } - ~CommandObjectCommandsHistory () {} + ~CommandObjectCommandsHistory () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -70,11 +70,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +108,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_start_idx.Clear(); m_stop_idx.Clear(); @@ -118,7 +117,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -136,7 +135,7 @@ }; bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_clear.GetCurrentValue() && m_options.m_clear.OptionWasSet()) { @@ -259,15 +258,15 @@ m_arguments.push_back (arg); } - ~CommandObjectCommandsSource () {} + ~CommandObjectCommandsSource () override {} - 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 +274,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 +290,8 @@ return matches.GetSize(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -311,11 +310,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +341,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_stop_on_error.Clear(); m_silent_run.Clear(); @@ -351,7 +349,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -368,7 +366,7 @@ }; bool - DoExecute(Args& command, CommandReturnObject &result) + DoExecute(Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); if (argc == 1) @@ -553,13 +551,13 @@ m_arguments.push_back (arg3); } - ~CommandObjectCommandsAlias () + ~CommandObjectCommandsAlias () override { } 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); @@ -820,13 +818,13 @@ m_arguments.push_back (arg); } - ~CommandObjectCommandsUnalias() + ~CommandObjectCommandsUnalias() override { } protected: bool - DoExecute (Args& args, CommandReturnObject &result) + DoExecute (Args& args, CommandReturnObject &result) override { CommandObject::CommandMap::iterator pos; CommandObject *cmd_obj; @@ -913,13 +911,13 @@ m_arguments.push_back (arg); } - ~CommandObjectCommandsDelete() + ~CommandObjectCommandsDelete() override { } protected: bool - DoExecute (Args& args, CommandReturnObject &result) + DoExecute (Args& args, CommandReturnObject &result) override { CommandObject::CommandMap::iterator pos; @@ -1000,7 +998,7 @@ ); } - ~CommandObjectCommandsAddRegex() + ~CommandObjectCommandsAddRegex() override { } @@ -1250,11 +1248,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +1274,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_help.clear(); m_syntax.clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1363,13 +1360,12 @@ } } - virtual - ~CommandObjectPythonFunction () + ~CommandObjectPythonFunction () override { } - virtual bool - IsRemovable () const + bool + IsRemovable () const override { return true; } @@ -1386,8 +1382,8 @@ return m_synchro; } - virtual const char * - GetHelpLong () + const char * + GetHelpLong () override { if (!m_fetched_help_long) { @@ -1404,8 +1400,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(); @@ -1470,13 +1466,12 @@ GetFlags().Set(scripter->GetFlagsForCommandObject(cmd_obj_sp)); } - virtual - ~CommandObjectScriptingObject () + ~CommandObjectScriptingObject () override { } - virtual bool - IsRemovable () const + bool + IsRemovable () const override { return true; } @@ -1493,8 +1488,8 @@ return m_synchro; } - virtual const char * - GetHelp () + const char * + GetHelp () override { if (!m_fetched_help_short) { @@ -1510,8 +1505,8 @@ return CommandObjectRaw::GetHelp(); } - virtual const char * - GetHelpLong () + const char * + GetHelpLong () override { if (!m_fetched_help_long) { @@ -1528,8 +1523,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(); @@ -1592,11 +1587,11 @@ m_arguments.push_back (arg1); } - ~CommandObjectCommandsScriptImport () + ~CommandObjectCommandsScriptImport () override { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -1604,7 +1599,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 +1615,8 @@ return matches.GetSize(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1637,11 +1632,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +1654,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_allow_reload = true; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1681,7 +1675,7 @@ }; bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_interpreter.GetDebugger().GetScriptLanguage() != lldb::eScriptLanguagePython) { @@ -1772,12 +1766,12 @@ m_arguments.push_back (arg1); } - ~CommandObjectCommandsScriptAdd () + ~CommandObjectCommandsScriptAdd () override { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1797,11 +1791,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +1827,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_class_name.clear(); m_funct_name.clear(); @@ -1843,7 +1836,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1860,8 +1853,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 +1865,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 +1928,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_interpreter.GetDebugger().GetScriptLanguage() != lldb::eScriptLanguagePython) @@ -2064,12 +2057,12 @@ { } - ~CommandObjectCommandsScriptList () + ~CommandObjectCommandsScriptList () override { } bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_interpreter.GetHelp(result, @@ -2100,13 +2093,13 @@ { } - ~CommandObjectCommandsScriptClear () + ~CommandObjectCommandsScriptClear () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_interpreter.RemoveAllUser(); @@ -2144,13 +2137,13 @@ m_arguments.push_back (arg1); } - ~CommandObjectCommandsScriptDelete () + ~CommandObjectCommandsScriptDelete () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { size_t argc = command.GetArgumentCount(); @@ -2202,7 +2195,7 @@ LoadSubCommand ("import", CommandObjectSP (new CommandObjectCommandsScriptImport (interpreter))); } - ~CommandObjectMultiwordCommandsScript () + ~CommandObjectMultiwordCommandsScript () override { } Index: lldb/trunk/source/Commands/CommandObjectFrame.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectFrame.cpp +++ lldb/trunk/source/Commands/CommandObjectFrame.cpp @@ -71,13 +71,13 @@ { } - ~CommandObjectFrameInfo () + ~CommandObjectFrameInfo () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_exe_ctx.GetFrameRef().DumpUsingSettingsFormat (&result.GetOutputStream()); result.SetStatus (eReturnStatusSuccessFinishResult); @@ -105,13 +105,12 @@ OptionParsingStarting (); } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +132,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { relative_frame_offset = INT32_MIN; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -175,13 +174,12 @@ m_arguments.push_back (arg); } - ~CommandObjectFrameSelect () + ~CommandObjectFrameSelect () override { } - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -189,7 +187,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(); @@ -342,20 +340,18 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectFrameVariable () + ~CommandObjectFrameVariable () override { } - virtual Options * - GetOptions () + GetOptions () override { return &m_option_group; } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -363,7 +359,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 +377,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: lldb/trunk/source/Commands/CommandObjectLog.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectLog.cpp +++ lldb/trunk/source/Commands/CommandObjectLog.cpp @@ -77,13 +77,12 @@ m_arguments.push_back (arg2); } - virtual - ~CommandObjectLogEnable() + ~CommandObjectLogEnable() override { } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -122,13 +121,12 @@ } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +152,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { log_file.Clear(); log_options = 0; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -177,9 +175,9 @@ }; protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { if (args.GetArgumentCount() < 2) { @@ -260,15 +258,14 @@ m_arguments.push_back (arg2); } - virtual - ~CommandObjectLogDisable() + ~CommandObjectLogDisable() override { } protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { const size_t argc = args.GetArgumentCount(); if (argc == 0) @@ -332,15 +329,14 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectLogList() + ~CommandObjectLogList() override { } protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { const size_t argc = args.GetArgumentCount(); if (argc == 0) @@ -396,15 +392,14 @@ { } - virtual - ~CommandObjectLogTimer() + ~CommandObjectLogTimer() override { } protected: - virtual bool + bool DoExecute (Args& args, - CommandReturnObject &result) + CommandReturnObject &result) override { const size_t argc = args.GetArgumentCount(); result.SetStatus(eReturnStatusFailed); Index: lldb/trunk/source/Commands/CommandObjectMemory.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectMemory.cpp +++ lldb/trunk/source/Commands/CommandObjectMemory.cpp @@ -67,28 +67,27 @@ { } - virtual - ~OptionGroupReadMemory () + ~OptionGroupReadMemory () override { } - 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 +119,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_num_per_line.Clear(); m_output_as_binary = false; @@ -367,25 +366,25 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectMemoryRead () + ~CommandObjectMemoryRead () override { } 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(); @@ -966,27 +965,26 @@ { } - virtual - ~OptionGroupFindMemory () + ~OptionGroupFindMemory () override { } - 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 +1016,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_expr.Clear(); m_string.Clear(); @@ -1068,20 +1066,19 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectMemoryFind () + ~CommandObjectMemoryFind () override { } 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(); @@ -1258,27 +1255,26 @@ { } - virtual - ~OptionGroupWriteMemory () + ~OptionGroupWriteMemory () override { } - 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 +1308,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_infile.Clear(); m_infile_offset = 0; @@ -1363,13 +1359,12 @@ } - virtual - ~CommandObjectMemoryWrite () + ~CommandObjectMemoryWrite () override { } Options * - GetOptions () + GetOptions () override { return &m_option_group; } @@ -1402,8 +1397,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(); @@ -1711,19 +1706,19 @@ m_arguments.push_back (arg1); } - virtual - ~CommandObjectMemoryHistory () + ~CommandObjectMemoryHistory () override { } - 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: lldb/trunk/source/Commands/CommandObjectPlatform.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectPlatform.cpp +++ lldb/trunk/source/Commands/CommandObjectPlatform.cpp @@ -86,15 +86,14 @@ { } - virtual - ~OptionPermissions () + ~OptionPermissions () override { } - 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 +154,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; } @@ -198,19 +197,18 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectPlatformSelect () + ~CommandObjectPlatformSelect () override { } - 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 +223,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) { @@ -291,14 +289,13 @@ { } - virtual - ~CommandObjectPlatformList () + ~CommandObjectPlatformList () override { } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Stream &ostrm = result.GetOutputStream(); ostrm.Printf("Available platforms:\n"); @@ -346,14 +343,13 @@ { } - virtual - ~CommandObjectPlatformStatus () + ~CommandObjectPlatformStatus () override { } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Stream &ostrm = result.GetOutputStream(); @@ -396,14 +392,13 @@ { } - virtual - ~CommandObjectPlatformConnect () + ~CommandObjectPlatformConnect () override { } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { Stream &ostrm = result.GetOutputStream(); @@ -430,8 +425,8 @@ return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); OptionGroupOptions* m_platform_options = NULL; @@ -461,14 +456,13 @@ { } - virtual - ~CommandObjectPlatformDisconnect () + ~CommandObjectPlatformDisconnect () override { } 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) @@ -543,14 +537,13 @@ m_options.Append (&m_option_working_dir, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1); } - virtual - ~CommandObjectPlatformSettings () + ~CommandObjectPlatformSettings () override { } 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 +559,8 @@ return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { if (m_options.DidFinalize() == false) m_options.Finalize(); @@ -597,13 +590,12 @@ { } - virtual - ~CommandObjectPlatformMkDir () + ~CommandObjectPlatformMkDir () override { } - 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 +627,8 @@ return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { if (m_options.DidFinalize() == false) { @@ -665,13 +657,12 @@ { } - virtual - ~CommandObjectPlatformFOpen () + ~CommandObjectPlatformFOpen () override { } - 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 +699,8 @@ } return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { if (m_options.DidFinalize() == false) { @@ -736,13 +727,12 @@ { } - virtual - ~CommandObjectPlatformFClose () + ~CommandObjectPlatformFClose () override { } - 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) @@ -788,13 +778,12 @@ { } - virtual - ~CommandObjectPlatformFRead () + ~CommandObjectPlatformFRead () override { } - 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 +805,8 @@ } return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -832,13 +821,12 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +854,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_offset = 0; m_count = 1; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -914,13 +902,12 @@ { } - virtual - ~CommandObjectPlatformFWrite () + ~CommandObjectPlatformFWrite () override { } - 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 +931,8 @@ } return result.Succeeded(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -960,13 +947,12 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +978,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_offset = 0; m_data.clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1041,8 +1027,7 @@ LoadSubCommand ("write", CommandObjectSP (new CommandObjectPlatformFWrite (interpreter))); } - virtual - ~CommandObjectPlatformFile () + ~CommandObjectPlatformFile () override { } @@ -1094,13 +1079,12 @@ m_arguments.push_back (arg2); } - virtual - ~CommandObjectPlatformGetFile () + ~CommandObjectPlatformGetFile () override { } - 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) @@ -1172,13 +1156,12 @@ m_arguments.push_back (arg1); } - virtual - ~CommandObjectPlatformGetSize () + ~CommandObjectPlatformGetSize () override { } - 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) @@ -1228,13 +1211,12 @@ { } - virtual - ~CommandObjectPlatformPutFile () + ~CommandObjectPlatformPutFile () override { } - 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); @@ -1281,20 +1263,19 @@ { } - virtual - ~CommandObjectPlatformProcessLaunch () + ~CommandObjectPlatformProcessLaunch () override { } - 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; @@ -1398,20 +1379,19 @@ { } - virtual - ~CommandObjectPlatformProcessList () + ~CommandObjectPlatformProcessList () override { } - 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; @@ -1524,13 +1504,12 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +1599,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { match_info.Clear(); show_args = false; @@ -1628,7 +1607,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1698,14 +1677,13 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectPlatformProcessInfo () + ~CommandObjectPlatformProcessInfo () override { } 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; @@ -1793,12 +1771,12 @@ OptionParsingStarting (); } - ~CommandOptions () + ~CommandOptions () override { } 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 +1817,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 +1837,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; @@ -1921,13 +1899,13 @@ { } - ~CommandObjectPlatformProcessAttach () + ~CommandObjectPlatformProcessAttach () override { } bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform()); if (platform_sp) @@ -1957,7 +1935,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1998,8 +1976,7 @@ } - virtual - ~CommandObjectPlatformProcess () + ~CommandObjectPlatformProcess () override { } @@ -2027,8 +2004,7 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } @@ -2038,15 +2014,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 +2046,8 @@ return error; } - virtual void - OptionParsingStarting () + void + OptionParsingStarting () override { } @@ -2091,20 +2067,18 @@ { } - virtual - ~CommandObjectPlatformShell () + ~CommandObjectPlatformShell () override { } - 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(); @@ -2218,13 +2192,12 @@ { } - virtual - ~CommandObjectPlatformInstall () + ~CommandObjectPlatformInstall () override { } - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { if (args.GetArgumentCount() != 2) { Index: lldb/trunk/source/Commands/CommandObjectPlugin.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectPlugin.cpp +++ lldb/trunk/source/Commands/CommandObjectPlugin.cpp @@ -41,7 +41,7 @@ m_arguments.push_back (arg1); } - ~CommandObjectPluginLoad () + ~CommandObjectPluginLoad () override { } @@ -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: lldb/trunk/source/Commands/CommandObjectProcess.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectProcess.cpp +++ lldb/trunk/source/Commands/CommandObjectProcess.cpp @@ -47,7 +47,7 @@ CommandObjectParsed (interpreter, name, help, syntax, flags), m_new_process_action (new_process_action) {} - virtual ~CommandObjectProcessLaunchOrAttach () {} + ~CommandObjectProcessLaunchOrAttach () override {} protected: bool StopProcessIfNecessary (Process *process, StateType &state, CommandReturnObject &result) @@ -142,11 +142,11 @@ } - ~CommandObjectProcessLaunch () + ~CommandObjectProcessLaunch () override { } - 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,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 { // No repeat for "process launch"... return ""; @@ -184,7 +185,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(); @@ -338,12 +339,12 @@ OptionParsingStarting (); } - ~CommandOptions () + ~CommandOptions () override { } 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 +393,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 +413,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; @@ -476,20 +477,19 @@ { } - ~CommandObjectProcessAttach () + ~CommandObjectProcessAttach () override { } 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()); @@ -646,7 +646,7 @@ } - ~CommandObjectProcessContinue () + ~CommandObjectProcessContinue () override { } @@ -663,12 +663,12 @@ OptionParsingStarting (); } - ~CommandOptions () + ~CommandOptions () override { } 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 +689,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_ignore = 0; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -708,7 +708,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 +807,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -842,12 +842,12 @@ OptionParsingStarting (); } - ~CommandOptions () + ~CommandOptions () override { } 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 +876,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_keep_stopped = eLazyBoolCalculate; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -907,12 +907,12 @@ { } - ~CommandObjectProcessDetach () + ~CommandObjectProcessDetach () override { } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -920,7 +920,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: @@ -982,12 +982,12 @@ OptionParsingStarting (); } - ~CommandOptions () + ~CommandOptions () override { } 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 +1006,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { plugin_name.clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1036,21 +1036,20 @@ { } - ~CommandObjectProcessConnect () + ~CommandObjectProcessConnect () override { } 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()); @@ -1152,12 +1151,12 @@ { } - ~CommandObjectProcessPlugin () + ~CommandObjectProcessPlugin () override { } - virtual CommandObject * - GetProxyCommandObject() + CommandObject * + GetProxyCommandObject() override { Process *process = m_interpreter.GetExecutionContext().GetProcessPtr(); if (process) @@ -1188,14 +1187,13 @@ { } - ~CommandObjectProcessLoad () + ~CommandObjectProcessLoad () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); @@ -1245,14 +1243,13 @@ { } - ~CommandObjectProcessUnload () + ~CommandObjectProcessUnload () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); @@ -1318,14 +1315,13 @@ m_arguments.push_back (arg); } - ~CommandObjectProcessSignal () + ~CommandObjectProcessSignal () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); @@ -1390,14 +1386,13 @@ { } - ~CommandObjectProcessInterrupt () + ~CommandObjectProcessInterrupt () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); if (process == NULL) @@ -1452,14 +1447,13 @@ { } - ~CommandObjectProcessKill () + ~CommandObjectProcessKill () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); if (process == NULL) @@ -1513,14 +1507,14 @@ { } - ~CommandObjectProcessSaveCore () + ~CommandObjectProcessSaveCore () override { } protected: bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { ProcessSP process_sp = m_exe_ctx.GetProcessSP(); if (process_sp) @@ -1575,13 +1569,13 @@ { } - ~CommandObjectProcessStatus() + ~CommandObjectProcessStatus() override { } bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -1620,12 +1614,12 @@ OptionParsingStarting (); } - ~CommandOptions () + ~CommandOptions () override { } 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 +1643,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { stop.clear(); notify.clear(); @@ -1657,7 +1651,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1694,12 +1688,12 @@ m_arguments.push_back (arg); } - ~CommandObjectProcessHandle () + ~CommandObjectProcessHandle () override { } Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1781,7 +1775,7 @@ protected: bool - DoExecute (Args &signal_args, CommandReturnObject &result) + DoExecute (Args &signal_args, CommandReturnObject &result) override { TargetSP target_sp = m_interpreter.GetDebugger().GetSelectedTarget(); Index: lldb/trunk/source/Commands/CommandObjectRegister.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectRegister.cpp +++ lldb/trunk/source/Commands/CommandObjectRegister.cpp @@ -74,13 +74,12 @@ } - virtual - ~CommandObjectRegisterRead () + ~CommandObjectRegisterRead () override { } Options * - GetOptions () + GetOptions () override { return &m_option_group; } @@ -170,8 +169,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 (); @@ -271,33 +270,32 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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; @@ -404,14 +402,13 @@ m_arguments.push_back (arg2); } - virtual - ~CommandObjectRegisterWrite () + ~CommandObjectRegisterWrite () override { } 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: lldb/trunk/source/Commands/CommandObjectSettings.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectSettings.cpp +++ lldb/trunk/source/Commands/CommandObjectSettings.cpp @@ -83,15 +83,14 @@ } - virtual - ~CommandObjectSettingsSet () {} + ~CommandObjectSettingsSet () override {} // 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; } @@ -106,11 +105,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +127,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_global = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -149,7 +147,7 @@ bool m_global; }; - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -157,7 +155,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 +213,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { Args cmd_args(command); @@ -321,11 +319,10 @@ m_arguments.push_back (arg1); } - virtual - ~CommandObjectSettingsShow () {} + ~CommandObjectSettingsShow () override {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -333,7 +330,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 +346,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -414,10 +411,9 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectSettingsList () {} + ~CommandObjectSettingsList () override {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -425,7 +421,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 +437,8 @@ } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -521,10 +517,9 @@ m_arguments.push_back (arg2); } - virtual - ~CommandObjectSettingsRemove () {} + ~CommandObjectSettingsRemove () override {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -532,7 +527,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 +546,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -652,14 +647,13 @@ } - virtual - ~CommandObjectSettingsReplace () {} + ~CommandObjectSettingsReplace () override {} // 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 +661,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 +680,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -773,14 +767,13 @@ m_arguments.push_back (arg3); } - virtual - ~CommandObjectSettingsInsertBefore () {} + ~CommandObjectSettingsInsertBefore () override {} // 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 +781,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 +800,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -897,14 +890,13 @@ m_arguments.push_back (arg3); } - virtual - ~CommandObjectSettingsInsertAfter () {} + ~CommandObjectSettingsInsertAfter () override {} // 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 +904,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 +923,8 @@ } protected: - virtual bool - DoExecute (const char *command, CommandReturnObject &result) + bool + DoExecute (const char *command, CommandReturnObject &result) override { result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -1011,14 +1003,13 @@ m_arguments.push_back (arg2); } - virtual - ~CommandObjectSettingsAppend () {} + ~CommandObjectSettingsAppend () override {} // 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 +1017,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 +1036,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); @@ -1117,10 +1108,9 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectSettingsClear () {} + ~CommandObjectSettingsClear () override {} - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -1128,7 +1118,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 +1137,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: lldb/trunk/source/Commands/CommandObjectSource.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectSource.cpp +++ lldb/trunk/source/Commands/CommandObjectSource.cpp @@ -49,12 +49,12 @@ { } - ~CommandOptions () + ~CommandOptions () override { } 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; } @@ -110,20 +110,20 @@ { } - ~CommandObjectSourceInfo () + ~CommandObjectSourceInfo () override { } 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); @@ -157,12 +157,12 @@ { } - ~CommandOptions () + ~CommandOptions () override { } 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; } @@ -256,19 +256,19 @@ { } - ~CommandObjectSourceList () + ~CommandObjectSourceList () override { } 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: lldb/trunk/source/Commands/CommandObjectTarget.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectTarget.cpp +++ lldb/trunk/source/Commands/CommandObjectTarget.cpp @@ -187,17 +187,17 @@ m_option_group.Finalize(); } - ~CommandObjectTargetCreate () + ~CommandObjectTargetCreate () override { } 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()); @@ -477,14 +477,13 @@ { } - virtual - ~CommandObjectTargetList () + ~CommandObjectTargetList () override { } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { if (args.GetArgumentCount() == 0) { @@ -525,14 +524,13 @@ { } - virtual - ~CommandObjectTargetSelect () + ~CommandObjectTargetSelect () override { } protected: - virtual bool - DoExecute (Args& args, CommandReturnObject &result) + bool + DoExecute (Args& args, CommandReturnObject &result) override { if (args.GetArgumentCount() == 1) { @@ -622,20 +620,19 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectTargetDelete () + ~CommandObjectTargetDelete () override { } 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; @@ -777,8 +774,7 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectTargetVariable () + ~CommandObjectTargetVariable () override { } @@ -850,7 +846,7 @@ } Options * - GetOptions () + GetOptions () override { return &m_option_group; } @@ -896,8 +892,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(); @@ -1134,14 +1130,13 @@ m_arguments.push_back (arg); } - ~CommandObjectTargetModulesSearchPathsAdd () + ~CommandObjectTargetModulesSearchPathsAdd () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1207,14 +1202,13 @@ { } - ~CommandObjectTargetModulesSearchPathsClear () + ~CommandObjectTargetModulesSearchPathsClear () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1277,14 +1271,13 @@ m_arguments.push_back (arg2); } - ~CommandObjectTargetModulesSearchPathsInsert () + ~CommandObjectTargetModulesSearchPathsInsert () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1366,14 +1359,13 @@ { } - ~CommandObjectTargetModulesSearchPathsList () + ~CommandObjectTargetModulesSearchPathsList () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -1423,14 +1415,13 @@ m_arguments.push_back (arg); } - ~CommandObjectTargetModulesSearchPathsQuery () + ~CommandObjectTargetModulesSearchPathsQuery () override { } protected: bool - DoExecute (Args& command, - CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (target) @@ -2062,12 +2053,11 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectTargetModulesModuleAutoComplete () + ~CommandObjectTargetModulesModuleAutoComplete () override { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -2075,7 +2065,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)); @@ -2124,12 +2114,11 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectTargetModulesSourceFileAutoComplete () + ~CommandObjectTargetModulesSourceFileAutoComplete () override { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -2137,7 +2126,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)); @@ -2171,13 +2160,12 @@ { } - virtual - ~CommandObjectTargetModulesDumpSymtab () + ~CommandObjectTargetModulesDumpSymtab () override { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2191,13 +2179,12 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +2207,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_sort_order = eSortOrderNone; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2238,9 +2225,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) @@ -2365,15 +2351,13 @@ { } - virtual - ~CommandObjectTargetModulesDumpSections () + ~CommandObjectTargetModulesDumpSections () override { } 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) @@ -2471,15 +2455,13 @@ { } - virtual - ~CommandObjectTargetModulesDumpSymfile () + ~CommandObjectTargetModulesDumpSymfile () override { } 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) @@ -2574,15 +2556,13 @@ { } - virtual - ~CommandObjectTargetModulesDumpLineTable () + ~CommandObjectTargetModulesDumpLineTable () override { } protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_exe_ctx.GetTargetPtr(); uint32_t total_num_dumped = 0; @@ -2663,8 +2643,7 @@ LoadSubCommand ("line-table", CommandObjectSP (new CommandObjectTargetModulesDumpLineTable (interpreter))); } - virtual - ~CommandObjectTargetModulesDump() + ~CommandObjectTargetModulesDump() override { } }; @@ -2685,18 +2664,17 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectTargetModulesAdd () + ~CommandObjectTargetModulesAdd () override { } - 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 +2682,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 +2703,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) @@ -2888,21 +2865,19 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectTargetModulesLoad () + ~CommandObjectTargetModulesLoad () override { } - 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) @@ -3145,13 +3120,12 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +3150,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_format_array.clear(); m_use_global_module_list = false; @@ -3184,7 +3158,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3209,22 +3183,19 @@ { } - virtual - ~CommandObjectTargetModulesList () + ~CommandObjectTargetModulesList () override { } - 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; @@ -3590,13 +3561,12 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +3601,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_type = eLookupTypeInvalid; m_str.clear(); @@ -3639,7 +3609,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3668,22 +3638,19 @@ { } - virtual - ~CommandObjectTargetModulesShowUnwind () + ~CommandObjectTargetModulesShowUnwind () override { } - 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(); @@ -3905,13 +3872,12 @@ OptionParsingStarting(); } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +3954,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_type = eLookupTypeInvalid; m_str.clear(); @@ -4003,7 +3969,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -4045,13 +4011,12 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectTargetModulesLookup () + ~CommandObjectTargetModulesLookup () override { } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -4205,9 +4170,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) @@ -4353,7 +4317,7 @@ LoadSubCommand ("query", CommandObjectSP (new CommandObjectTargetModulesSearchPathsQuery (interpreter))); } - ~CommandObjectTargetModulesImageSearchPaths() + ~CommandObjectTargetModulesImageSearchPaths() override { } }; @@ -4387,8 +4351,8 @@ LoadSubCommand ("show-unwind", CommandObjectSP (new CommandObjectTargetModulesShowUnwind (interpreter))); } - virtual - ~CommandObjectTargetModules() + + ~CommandObjectTargetModules() override { } @@ -4420,12 +4384,11 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectTargetSymbolsAdd () + ~CommandObjectTargetSymbolsAdd () override { } - virtual int + int HandleArgumentCompletion (Args &input, int &cursor_index, int &cursor_char_position, @@ -4433,7 +4396,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 +4412,8 @@ return matches.GetSize(); } - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } @@ -4628,9 +4591,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); @@ -4848,8 +4810,8 @@ LoadSubCommand ("add", CommandObjectSP (new CommandObjectTargetSymbolsAdd (interpreter))); } - virtual - ~CommandObjectTargetSymbols() + + ~CommandObjectTargetSymbols() override { } @@ -4888,16 +4850,16 @@ { } - ~CommandOptions () {} + ~CommandOptions () override {} 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 +4946,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_class_name.clear(); m_function_name.clear(); @@ -5029,7 +4991,7 @@ }; Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -5044,13 +5006,13 @@ { } - ~CommandObjectTargetStopHookAdd () + ~CommandObjectTargetStopHookAdd () override { } protected: - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { StreamFileSP output_sp(io_handler.GetOutputStreamFile()); if (output_sp) @@ -5060,8 +5022,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 +5055,7 @@ } bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { m_stop_hook_sp.reset(); @@ -5241,13 +5203,13 @@ { } - ~CommandObjectTargetStopHookDelete () + ~CommandObjectTargetStopHookDelete () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target) @@ -5317,13 +5279,13 @@ { } - ~CommandObjectTargetStopHookEnableDisable () + ~CommandObjectTargetStopHookEnableDisable () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (target) @@ -5387,13 +5349,13 @@ { } - ~CommandObjectTargetStopHookList () + ~CommandObjectTargetStopHookList () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = GetSelectedOrDummyTarget(); if (!target) @@ -5453,7 +5415,7 @@ LoadSubCommand ("list", CommandObjectSP (new CommandObjectTargetStopHookList (interpreter))); } - ~CommandObjectMultiwordTargetStopHooks() + ~CommandObjectMultiwordTargetStopHooks() override { } }; Index: lldb/trunk/source/Commands/CommandObjectThread.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectThread.cpp +++ lldb/trunk/source/Commands/CommandObjectThread.cpp @@ -58,9 +58,10 @@ { } - virtual ~CommandObjectIterateOverThreads() {} - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + ~CommandObjectIterateOverThreads() override {} + + bool + DoExecute (Args& command, CommandReturnObject &result) override { result.SetStatus (m_success_return); @@ -162,13 +163,12 @@ OptionParsingStarting (); } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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; } @@ -248,12 +248,12 @@ { } - ~CommandObjectThreadBacktrace() + ~CommandObjectThreadBacktrace() override { } - 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(); @@ -343,13 +343,12 @@ OptionParsingStarting (); } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +425,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_step_in_avoid_no_debug = eLazyBoolCalculate; m_step_out_avoid_no_debug = eLazyBoolCalculate; @@ -444,7 +443,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -493,21 +492,19 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectThreadStepWithTypeAndScope () + ~CommandObjectThreadStepWithTypeAndScope () override { } - 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(); @@ -780,13 +777,12 @@ } - virtual - ~CommandObjectThreadContinue () + ~CommandObjectThreadContinue () override { } - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { bool synchronous_execution = m_interpreter.GetSynchronous (); @@ -980,13 +976,12 @@ OptionParsingStarting (); } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +1037,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_thread_idx = LLDB_INVALID_THREAD_ID; m_frame_idx = 0; @@ -1051,7 +1046,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1093,21 +1088,19 @@ } - virtual - ~CommandObjectThreadUntil () + ~CommandObjectThreadUntil () override { } - 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 (); @@ -1371,14 +1364,13 @@ } - virtual - ~CommandObjectThreadSelect () + ~CommandObjectThreadSelect () override { } protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Process *process = m_exe_ctx.GetProcessPtr(); if (process == NULL) @@ -1434,13 +1426,13 @@ { } - ~CommandObjectThreadList() + ~CommandObjectThreadList() override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { Stream &strm = result.GetOutputStream(); result.SetStatus (eReturnStatusSuccessFinishNoResult); @@ -1492,19 +1484,18 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_json_thread = false; m_json_stopinfo = false; } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +1518,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1538,21 +1529,18 @@ static OptionDefinition g_option_table[]; }; - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } - - virtual - ~CommandObjectThreadInfo () + ~CommandObjectThreadInfo () override { } - 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)) @@ -1597,13 +1585,12 @@ OptionParsingStarting (); } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +1618,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_from_expression = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1651,9 +1638,8 @@ // Instance variables to hold the values for command options. }; - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1686,17 +1672,14 @@ } - ~CommandObjectThreadReturn() + ~CommandObjectThreadReturn() override { } 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 +1793,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_filenames.Clear(); m_line_num = 0; @@ -1819,13 +1802,12 @@ m_force = false; } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +1848,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1880,9 +1862,8 @@ static OptionDefinition g_option_table[]; }; - virtual Options * - GetOptions () + GetOptions () override { return &m_options; } @@ -1900,13 +1881,13 @@ { } - ~CommandObjectThreadJump() + ~CommandObjectThreadJump() override { } 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(); @@ -2017,13 +1998,12 @@ OptionParsingStarting (); } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +2029,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_verbose = false; m_internal = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2085,19 +2065,19 @@ { } - ~CommandObjectThreadPlanList () + ~CommandObjectThreadPlanList () override { } - 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; @@ -2148,10 +2128,10 @@ m_arguments.push_back (arg); } - virtual ~CommandObjectThreadPlanDiscard () {} + ~CommandObjectThreadPlanDiscard () override {} bool - DoExecute (Args& args, CommandReturnObject &result) + DoExecute (Args& args, CommandReturnObject &result) override { Thread *thread = m_exe_ctx.GetThreadPtr(); if (args.GetArgumentCount() != 1) @@ -2211,7 +2191,7 @@ LoadSubCommand ("discard", CommandObjectSP (new CommandObjectThreadPlanDiscard (interpreter))); } - virtual ~CommandObjectMultiwordThreadPlan () {} + ~CommandObjectMultiwordThreadPlan () override {} }; Index: lldb/trunk/source/Commands/CommandObjectType.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectType.cpp +++ lldb/trunk/source/Commands/CommandObjectType.cpp @@ -147,17 +147,16 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +179,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -203,12 +202,12 @@ CommandObjectTypeSummaryAdd (CommandInterpreter &interpreter); - ~CommandObjectTypeSummaryAdd () + ~CommandObjectTypeSummaryAdd () override { } - 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 +223,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 +355,7 @@ Error* error = NULL); protected: bool - DoExecute (Args& command, CommandReturnObject &result); + DoExecute (Args& command, CommandReturnObject &result) override; }; @@ -386,11 +385,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +429,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_cascade = true; m_class_name = ""; @@ -444,7 +442,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -472,8 +470,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -486,7 +484,7 @@ protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { WarnOnPotentialUnquotedUnsignedType(command, result); @@ -502,8 +500,8 @@ } } - virtual void - IOHandlerActivated (IOHandler &io_handler) + void + IOHandlerActivated (IOHandler &io_handler) override { StreamFileSP output_sp(io_handler.GetOutputStreamFile()); if (output_sp) @@ -514,8 +512,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(); @@ -629,7 +627,7 @@ CommandObjectTypeSynthAdd (CommandInterpreter &interpreter); - ~CommandObjectTypeSynthAdd () + ~CommandObjectTypeSynthAdd () override { } @@ -659,22 +657,21 @@ { } - virtual - ~CommandOptions () + ~CommandOptions () override { } - 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 +680,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 +737,8 @@ OptionGroupFormat m_format_options; CommandOptions m_command_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } @@ -809,13 +806,13 @@ } - ~CommandObjectTypeFormatAdd () + ~CommandObjectTypeFormatAdd () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -926,11 +923,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +948,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -977,8 +973,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1012,13 +1008,13 @@ } - ~CommandObjectTypeFormatDelete () + ~CommandObjectTypeFormatDelete () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -1093,11 +1089,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +1111,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1139,8 +1134,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1165,13 +1160,13 @@ { } - ~CommandObjectTypeFormatClear () + ~CommandObjectTypeFormatClear () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) DataVisualization::Categories::LoopThrough(PerCategoryCallback, NULL); @@ -1232,11 +1227,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +1249,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -1278,8 +1272,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -1303,13 +1297,13 @@ m_arguments.push_back (type_arg); } - ~CommandObjectTypeFormatList () + ~CommandObjectTypeFormatList () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -1950,11 +1944,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +1969,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2001,8 +1994,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2036,13 +2029,13 @@ } - ~CommandObjectTypeSummaryDelete () + ~CommandObjectTypeSummaryDelete () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2113,11 +2106,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +2128,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2159,8 +2151,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2185,13 +2177,13 @@ { } - ~CommandObjectTypeSummaryClear () + ~CommandObjectTypeSummaryClear () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) @@ -2257,11 +2249,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +2271,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2303,8 +2294,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2328,13 +2319,13 @@ m_arguments.push_back (type_arg); } - ~CommandObjectTypeSummaryList () + ~CommandObjectTypeSummaryList () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2471,11 +2462,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +2487,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_define_enabled.Clear(); m_cate_language.Clear(); } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2523,8 +2513,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2549,13 +2539,13 @@ } - ~CommandObjectTypeCategoryDefine () + ~CommandObjectTypeCategoryDefine () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2607,11 +2597,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +2624,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_language = lldb::eLanguageTypeUnknown; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2658,8 +2647,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2684,13 +2673,13 @@ } - ~CommandObjectTypeCategoryEnable () + ~CommandObjectTypeCategoryEnable () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2772,13 +2761,13 @@ } - ~CommandObjectTypeCategoryDelete () + ~CommandObjectTypeCategoryDelete () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -2835,11 +2824,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +2851,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_language = lldb::eLanguageTypeUnknown; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -2886,8 +2874,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -2912,13 +2900,13 @@ } - ~CommandObjectTypeCategoryDisable () + ~CommandObjectTypeCategoryDisable () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3023,13 +3011,13 @@ m_arguments.push_back (type_arg); } - ~CommandObjectTypeCategoryList () + ~CommandObjectTypeCategoryList () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); RegularExpression* regex = NULL; @@ -3090,11 +3078,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +3100,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3136,8 +3123,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3161,13 +3148,13 @@ m_arguments.push_back (type_arg); } - ~CommandObjectTypeFilterList () + ~CommandObjectTypeFilterList () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3303,11 +3290,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +3312,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_category_regex = ""; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3349,8 +3335,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3374,13 +3360,13 @@ m_arguments.push_back (type_arg); } - ~CommandObjectTypeSynthList () + ~CommandObjectTypeSynthList () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3500,11 +3486,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +3511,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3551,8 +3536,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3585,13 +3570,13 @@ } - ~CommandObjectTypeFilterDelete () + ~CommandObjectTypeFilterDelete () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3666,11 +3651,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +3676,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; m_category = "default"; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3717,8 +3701,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3751,13 +3735,13 @@ } - ~CommandObjectTypeSynthDelete () + ~CommandObjectTypeSynthDelete () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -3833,11 +3817,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +3839,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -3879,8 +3862,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -3904,13 +3887,13 @@ { } - ~CommandObjectTypeFilterClear () + ~CommandObjectTypeFilterClear () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) @@ -3962,11 +3945,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +3967,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_delete_all = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -4008,8 +3990,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -4033,13 +4015,13 @@ { } - ~CommandObjectTypeSynthClear () + ~CommandObjectTypeSynthClear () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { if (m_options.m_delete_all) @@ -4273,11 +4255,10 @@ { } - virtual - ~CommandOptions (){} + ~CommandOptions () override {} - 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 +4296,7 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_cascade = true; m_skip_pointers = false; @@ -4327,7 +4308,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -4354,8 +4335,8 @@ CommandOptions m_options; - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -4467,13 +4448,13 @@ ); } - ~CommandObjectTypeFilterAdd () + ~CommandObjectTypeFilterAdd () override { } protected: bool - DoExecute (Args& command, CommandReturnObject &result) + DoExecute (Args& command, CommandReturnObject &result) override { const size_t argc = command.GetArgumentCount(); @@ -4575,25 +4556,24 @@ m_language(eLanguageTypeUnknown) {} - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +4597,8 @@ return error; } - virtual void - OptionParsingStarting (CommandInterpreter &interpreter) + void + OptionParsingStarting (CommandInterpreter &interpreter) override { m_show_help = false; m_language = eLanguageTypeUnknown; @@ -4649,20 +4629,18 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectTypeLookup () + ~CommandObjectTypeLookup () override { } - 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]) { @@ -4797,14 +4775,13 @@ SetSyntax(syntax.GetData()); } - virtual - ~CommandObjectFormatterInfo () + ~CommandObjectFormatterInfo () override { } 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(); @@ -4869,7 +4846,7 @@ } - ~CommandObjectTypeFormat () + ~CommandObjectTypeFormat () override { } }; @@ -4897,7 +4874,7 @@ } - ~CommandObjectTypeSynth () + ~CommandObjectTypeSynth () override { } }; @@ -4920,7 +4897,7 @@ } - ~CommandObjectTypeFilter () + ~CommandObjectTypeFilter () override { } }; @@ -4942,7 +4919,7 @@ } - ~CommandObjectTypeCategory () + ~CommandObjectTypeCategory () override { } }; @@ -4968,7 +4945,7 @@ } - ~CommandObjectTypeSummary () + ~CommandObjectTypeSummary () override { } }; Index: lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp +++ lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp @@ -178,11 +178,10 @@ m_arguments.push_back(arg); } - virtual - ~CommandObjectWatchpointList () {} + ~CommandObjectWatchpointList () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -197,11 +196,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +224,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_level = lldb::eDescriptionLevelFull; } const OptionDefinition * - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -248,8 +246,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) @@ -361,13 +359,12 @@ m_arguments.push_back(arg); } - virtual - ~CommandObjectWatchpointEnable () {} + ~CommandObjectWatchpointEnable () override {} protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (!CheckTargetForWatchpointOperations(target, result)) @@ -441,12 +438,11 @@ } - virtual - ~CommandObjectWatchpointDisable () {} + ~CommandObjectWatchpointDisable () override {} 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)) @@ -524,12 +520,11 @@ m_arguments.push_back(arg); } - virtual - ~CommandObjectWatchpointDelete () {} + ~CommandObjectWatchpointDelete () override {} 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)) @@ -607,11 +602,10 @@ m_arguments.push_back(arg); } - virtual - ~CommandObjectWatchpointIgnore () {} + ~CommandObjectWatchpointIgnore () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -626,11 +620,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +646,13 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_ignore_count = 0; } const OptionDefinition * - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -675,9 +668,9 @@ }; protected: - virtual bool + bool DoExecute (Args& command, - CommandReturnObject &result) + CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); if (!CheckTargetForWatchpointOperations(target, result)) @@ -763,11 +756,10 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectWatchpointModify () {} + ~CommandObjectWatchpointModify () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_options; } @@ -783,11 +775,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +801,14 @@ } void - OptionParsingStarting () + OptionParsingStarting () override { m_condition.clear(); m_condition_passed = false; } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -833,8 +824,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)) @@ -958,11 +949,10 @@ m_option_group.Finalize(); } - virtual - ~CommandObjectWatchpointSetVariable () {} + ~CommandObjectWatchpointSetVariable () override {} - virtual Options * - GetOptions () + Options * + GetOptions () override { return &m_option_group; } @@ -983,8 +973,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(); @@ -1169,22 +1159,21 @@ } - virtual - ~CommandObjectWatchpointSetExpression () {} + ~CommandObjectWatchpointSetExpression () override {} // 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 @@ -1345,8 +1334,7 @@ } - virtual - ~CommandObjectWatchpointSet () {} + ~CommandObjectWatchpointSet () override {} }; Index: lldb/trunk/source/Commands/CommandObjectWatchpointCommand.cpp =================================================================== --- lldb/trunk/source/Commands/CommandObjectWatchpointCommand.cpp +++ lldb/trunk/source/Commands/CommandObjectWatchpointCommand.cpp @@ -169,17 +169,16 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectWatchpointCommandAdd () {} + ~CommandObjectWatchpointCommandAdd () override {} - 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 +189,8 @@ } - virtual void - IOHandlerInputComplete (IOHandler &io_handler, std::string &line) + void + IOHandlerInputComplete (IOHandler &io_handler, std::string &line) override { io_handler.SetIsDone(true); @@ -301,11 +300,10 @@ { } - virtual - ~CommandOptions () {} + ~CommandOptions () override {} - 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 +354,7 @@ return error; } void - OptionParsingStarting () + OptionParsingStarting () override { m_use_commands = true; m_use_script_language = false; @@ -369,7 +367,7 @@ } const OptionDefinition* - GetDefinitions () + GetDefinitions () override { return g_option_table; } @@ -392,8 +390,8 @@ }; protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); @@ -550,12 +548,11 @@ } - virtual - ~CommandObjectWatchpointCommandDelete () {} + ~CommandObjectWatchpointCommandDelete () override {} protected: - virtual bool - DoExecute (Args& command, CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); @@ -641,13 +638,11 @@ m_arguments.push_back (arg); } - virtual - ~CommandObjectWatchpointCommandList () {} + ~CommandObjectWatchpointCommandList () override {} protected: - virtual bool - DoExecute (Args& command, - CommandReturnObject &result) + bool + DoExecute (Args& command, CommandReturnObject &result) override { Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get();