Author: labath Date: Wed Sep 2 04:28:35 2015 New Revision: 246627 URL: http://llvm.org/viewvc/llvm-project?rev=246627&view=rev Log: Fix Clang-tidy misc-use-override warnings in some files in include/lldb/Interpreter, unify closing inclusion guards
patch by Eugene Zelenko. Differential Revision: http://reviews.llvm.org/D12171 Modified: lldb/trunk/include/lldb/Interpreter/OptionValueArch.h lldb/trunk/include/lldb/Interpreter/OptionValueArgs.h lldb/trunk/include/lldb/Interpreter/OptionValueArray.h lldb/trunk/include/lldb/Interpreter/OptionValueBoolean.h lldb/trunk/include/lldb/Interpreter/OptionValueChar.h lldb/trunk/include/lldb/Interpreter/OptionValueDictionary.h lldb/trunk/include/lldb/Interpreter/OptionValueEnumeration.h lldb/trunk/include/lldb/Interpreter/OptionValueFileSpec.h lldb/trunk/include/lldb/Interpreter/OptionValueFileSpecList.h lldb/trunk/include/lldb/Interpreter/OptionValueFormat.h lldb/trunk/include/lldb/Interpreter/OptionValueFormatEntity.h lldb/trunk/include/lldb/Interpreter/OptionValueLanguage.h lldb/trunk/include/lldb/Interpreter/OptionValuePathMappings.h lldb/trunk/include/lldb/Interpreter/OptionValueProperties.h lldb/trunk/include/lldb/Interpreter/OptionValueRegex.h lldb/trunk/include/lldb/Interpreter/OptionValueSInt64.h lldb/trunk/include/lldb/Interpreter/OptionValueString.h lldb/trunk/include/lldb/Interpreter/OptionValueUInt64.h lldb/trunk/include/lldb/Interpreter/OptionValueUUID.h Modified: lldb/trunk/include/lldb/Interpreter/OptionValueArch.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueArch.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueArch.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueArch.h Wed Sep 2 04:28:35 2015 @@ -52,8 +52,7 @@ public: { } - virtual - ~OptionValueArch() + ~OptionValueArch() override { } @@ -61,37 +60,37 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeArch; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual size_t - AutoComplete (CommandInterpreter &interpreter, - const char *s, - int match_start_point, - int max_return_elements, - bool &word_complete, - StringList &matches); + size_t + AutoComplete(CommandInterpreter &interpreter, + const char *s, + int match_start_point, + int max_return_elements, + bool &word_complete, + StringList &matches) override; //--------------------------------------------------------------------- // Subclass specific functions @@ -136,4 +135,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueArch_h_ +#endif // liblldb_OptionValueArch_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueArgs.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueArgs.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueArgs.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueArgs.h Wed Sep 2 04:28:35 2015 @@ -26,16 +26,15 @@ public: { } - virtual - ~OptionValueArgs() + ~OptionValueArgs() override { } size_t GetArgs (Args &args); - virtual Type - GetType() const + Type + GetType() const override { return eTypeArgs; } @@ -43,4 +42,4 @@ public: } // namespace lldb_private -#endif // liblldb_OptionValueArgs_h_ +#endif // liblldb_OptionValueArgs_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueArray.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueArray.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueArray.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueArray.h Wed Sep 2 04:28:35 2015 @@ -30,8 +30,7 @@ public: { } - virtual - ~OptionValueArray() + ~OptionValueArray() override { } @@ -39,41 +38,41 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeArray; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_values.clear(); m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual bool - IsAggregateValue () const + bool + IsAggregateValue() const override { return true; } - virtual lldb::OptionValueSP - GetSubValue (const ExecutionContext *exe_ctx, - const char *name, - bool will_modify, - Error &error) const; + lldb::OptionValueSP + GetSubValue(const ExecutionContext *exe_ctx, + const char *name, + bool will_modify, + Error &error) const override; //--------------------------------------------------------------------- // Subclass specific functions @@ -175,4 +174,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueArray_h_ +#endif // liblldb_OptionValueArray_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueBoolean.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueBoolean.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueBoolean.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueBoolean.h Wed Sep 2 04:28:35 2015 @@ -35,8 +35,7 @@ public: { } - virtual - ~OptionValueBoolean() + ~OptionValueBoolean() override { } @@ -44,34 +43,34 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeBoolean; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; return true; } - virtual size_t - AutoComplete (CommandInterpreter &interpreter, - const char *s, - int match_start_point, - int max_return_elements, - bool &word_complete, - StringList &matches); + size_t + AutoComplete(CommandInterpreter &interpreter, + const char *s, + int match_start_point, + int max_return_elements, + bool &word_complete, + StringList &matches) override; //--------------------------------------------------------------------- // Subclass specific functions @@ -128,8 +127,8 @@ public: m_default_value = value; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; protected: bool m_current_value; @@ -138,4 +137,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueBoolean_h_ +#endif // liblldb_OptionValueBoolean_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueChar.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueChar.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueChar.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueChar.h Wed Sep 2 04:28:35 2015 @@ -27,6 +27,7 @@ public: m_default_value (value) { } + OptionValueChar (char current_value, char default_value) : OptionValue(), @@ -35,8 +36,7 @@ public: { } - virtual - ~OptionValueChar() + ~OptionValueChar() override { } @@ -44,21 +44,21 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeChar; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; @@ -100,8 +100,8 @@ public: m_default_value = value; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; protected: char m_current_value; @@ -110,4 +110,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueChar_h_ +#endif // liblldb_OptionValueChar_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueDictionary.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueDictionary.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueDictionary.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueDictionary.h Wed Sep 2 04:28:35 2015 @@ -31,8 +31,7 @@ public: { } - virtual - ~OptionValueDictionary() + ~OptionValueDictionary() override { } @@ -40,32 +39,32 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeDictionary; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_values.clear(); m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual bool - IsAggregateValue () const + bool + IsAggregateValue() const override { return true; } @@ -89,17 +88,17 @@ public: lldb::OptionValueSP GetValueForKey (const ConstString &key) const; - virtual lldb::OptionValueSP - GetSubValue (const ExecutionContext *exe_ctx, - const char *name, - bool will_modify, - Error &error) const; - - virtual Error - SetSubValue (const ExecutionContext *exe_ctx, - VarSetOperationType op, - const char *name, - const char *value); + lldb::OptionValueSP + GetSubValue(const ExecutionContext *exe_ctx, + const char *name, + bool will_modify, + Error &error) const override; + + Error + SetSubValue(const ExecutionContext *exe_ctx, + VarSetOperationType op, + const char *name, + const char *value) override; //--------------------------------------------------------------------- // String value getters and setters @@ -136,4 +135,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueDictionary_h_ +#endif // liblldb_OptionValueDictionary_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueEnumeration.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueEnumeration.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueEnumeration.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueEnumeration.h Wed Sep 2 04:28:35 2015 @@ -23,7 +23,6 @@ namespace lldb_private { - class OptionValueEnumeration : public OptionValue { public: @@ -38,44 +37,43 @@ public: OptionValueEnumeration (const OptionEnumValueElement *enumerators, enum_type value); - virtual - ~OptionValueEnumeration(); + ~OptionValueEnumeration() override; //--------------------------------------------------------------------- // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeEnum; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual size_t - AutoComplete (CommandInterpreter &interpreter, - const char *s, - int match_start_point, - int max_return_elements, - bool &word_complete, - StringList &matches); + size_t + AutoComplete(CommandInterpreter &interpreter, + const char *s, + int match_start_point, + int max_return_elements, + bool &word_complete, + StringList &matches) override; //--------------------------------------------------------------------- // Subclass specific functions @@ -123,4 +121,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueEnumeration_h_ +#endif // liblldb_OptionValueEnumeration_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueFileSpec.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueFileSpec.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueFileSpec.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueFileSpec.h Wed Sep 2 04:28:35 2015 @@ -31,8 +31,7 @@ public: const FileSpec &default_value, bool resolve = true); - virtual - ~OptionValueFileSpec() + ~OptionValueFileSpec() override { } @@ -40,21 +39,21 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeFileSpec; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; @@ -63,16 +62,16 @@ public: return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual size_t - AutoComplete (CommandInterpreter &interpreter, - const char *s, - int match_start_point, - int max_return_elements, - bool &word_complete, - StringList &matches); + size_t + AutoComplete(CommandInterpreter &interpreter, + const char *s, + int match_start_point, + int max_return_elements, + bool &word_complete, + StringList &matches) override; //--------------------------------------------------------------------- // Subclass specific functions @@ -131,4 +130,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueFileSpec_h_ +#endif // liblldb_OptionValueFileSpec_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueFileSpecList.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueFileSpecList.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueFileSpecList.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueFileSpecList.h Wed Sep 2 04:28:35 2015 @@ -34,9 +34,7 @@ public: { } - - virtual - ~OptionValueFileSpecList() + ~OptionValueFileSpecList() override { } @@ -44,32 +42,32 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeFileSpecList; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value.Clear(); m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual bool - IsAggregateValue () const + bool + IsAggregateValue() const override { return true; } @@ -102,4 +100,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueFileSpecList_h_ +#endif // liblldb_OptionValueFileSpecList_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueFormat.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueFormat.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueFormat.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueFormat.h Wed Sep 2 04:28:35 2015 @@ -36,8 +36,7 @@ public: { } - virtual - ~OptionValueFormat() + ~OptionValueFormat() override { } @@ -45,29 +44,29 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeFormat; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; //--------------------------------------------------------------------- // Subclass specific functions @@ -104,4 +103,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueFormat_h_ +#endif // liblldb_OptionValueFormat_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueFormatEntity.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueFormatEntity.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueFormatEntity.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueFormatEntity.h Wed Sep 2 04:28:35 2015 @@ -24,8 +24,7 @@ class OptionValueFormatEntity : public O public: OptionValueFormatEntity (const char *default_format); - virtual - ~OptionValueFormatEntity() + ~OptionValueFormatEntity() override { } @@ -94,7 +93,6 @@ public: return m_default_entry; } - protected: std::string m_current_format; std::string m_default_format; @@ -104,4 +102,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueFormatEntity_h_ +#endif // liblldb_OptionValueFormatEntity_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueLanguage.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueLanguage.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueLanguage.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueLanguage.h Wed Sep 2 04:28:35 2015 @@ -37,8 +37,7 @@ public: { } - virtual - ~OptionValueLanguage () + ~OptionValueLanguage() override { } @@ -104,4 +103,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueLanguage_h_ +#endif // liblldb_OptionValueLanguage_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValuePathMappings.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValuePathMappings.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValuePathMappings.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValuePathMappings.h Wed Sep 2 04:28:35 2015 @@ -29,8 +29,7 @@ public: { } - virtual - ~OptionValuePathMappings() + ~OptionValuePathMappings() override { } @@ -38,32 +37,32 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypePathMap; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_path_mappings.Clear(m_notify_changes); m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual bool - IsAggregateValue () const + bool + IsAggregateValue() const override { return true; } @@ -91,4 +90,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValuePathMappings_h_ +#endif // liblldb_OptionValuePathMappings_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueProperties.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueProperties.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueProperties.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueProperties.h Wed Sep 2 04:28:35 2015 @@ -43,33 +43,33 @@ public: OptionValueProperties (const OptionValueProperties &global_properties); - virtual - ~OptionValueProperties() + ~OptionValueProperties() override { } - virtual Type - GetType () const + Type + GetType() const override { return eTypeProperties; } - virtual bool - Clear (); + bool + Clear() override; - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; - virtual Error - SetValueFromString (llvm::StringRef value, VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual void - DumpValue (const ExecutionContext *exe_ctx, - Stream &strm, - uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, + Stream &strm, + uint32_t dump_mask) override; - virtual ConstString - GetName () const + ConstString + GetName() const override { return m_name; } @@ -149,16 +149,16 @@ public: bool value_will_be_modified) const; lldb::OptionValueSP - GetSubValue (const ExecutionContext *exe_ctx, - const char *name, - bool value_will_be_modified, - Error &error) const; - - virtual Error - SetSubValue (const ExecutionContext *exe_ctx, - VarSetOperationType op, - const char *path, - const char *value); + GetSubValue(const ExecutionContext *exe_ctx, + const char *name, + bool value_will_be_modified, + Error &error) const override; + + Error + SetSubValue(const ExecutionContext *exe_ctx, + VarSetOperationType op, + const char *path, + const char *value) override; virtual bool PredicateMatches (const ExecutionContext *exe_ctx, @@ -254,6 +254,7 @@ public: SetValueChangedCallback (uint32_t property_idx, OptionValueChangedCallback callback, void *baton); + protected: Property * @@ -281,4 +282,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueProperties_h_ +#endif // liblldb_OptionValueProperties_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueRegex.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueRegex.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueRegex.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueRegex.h Wed Sep 2 04:28:35 2015 @@ -30,8 +30,7 @@ public: { } - virtual - ~OptionValueRegex() + ~OptionValueRegex() override { } @@ -39,29 +38,29 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeRegex; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_regex.Clear(); m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; //--------------------------------------------------------------------- // Subclass specific functions @@ -95,4 +94,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueRegex_h_ +#endif // liblldb_OptionValueRegex_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueSInt64.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueSInt64.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueSInt64.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueSInt64.h Wed Sep 2 04:28:35 2015 @@ -58,8 +58,7 @@ public: { } - virtual - ~OptionValueSInt64() + ~OptionValueSInt64() override { } @@ -67,29 +66,29 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeSInt64; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; //--------------------------------------------------------------------- // Subclass specific functions @@ -169,4 +168,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueSInt64_h_ +#endif // liblldb_OptionValueSInt64_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueString.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueString.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueString.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueString.h Wed Sep 2 04:28:35 2015 @@ -118,8 +118,7 @@ public: m_default_value.assign (default_value); } - virtual - ~OptionValueString() + ~OptionValueString() override { } @@ -127,29 +126,29 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeString; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; //--------------------------------------------------------------------- // Subclass specific functions @@ -213,7 +212,6 @@ public: return m_default_value.empty(); } - protected: std::string m_current_value; std::string m_default_value; @@ -224,4 +222,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueString_h_ +#endif // liblldb_OptionValueString_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueUInt64.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueUInt64.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueUInt64.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueUInt64.h Wed Sep 2 04:28:35 2015 @@ -43,8 +43,7 @@ public: { } - virtual - ~OptionValueUInt64() + ~OptionValueUInt64() override { } @@ -60,29 +59,29 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeUInt64; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_current_value = m_default_value; m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; //--------------------------------------------------------------------- // Subclass specific functions @@ -131,4 +130,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueUInt64_h_ +#endif // liblldb_OptionValueUInt64_h_ Modified: lldb/trunk/include/lldb/Interpreter/OptionValueUUID.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionValueUUID.h?rev=246627&r1=246626&r2=246627&view=diff ============================================================================== --- lldb/trunk/include/lldb/Interpreter/OptionValueUUID.h (original) +++ lldb/trunk/include/lldb/Interpreter/OptionValueUUID.h Wed Sep 2 04:28:35 2015 @@ -34,8 +34,7 @@ public: { } - virtual - ~OptionValueUUID() + ~OptionValueUUID() override { } @@ -43,29 +42,29 @@ public: // Virtual subclass pure virtual overrides //--------------------------------------------------------------------- - virtual OptionValue::Type - GetType () const + OptionValue::Type + GetType() const override { return eTypeUUID; } - virtual void - DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask); + void + DumpValue(const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) override; - virtual Error - SetValueFromString (llvm::StringRef value, - VarSetOperationType op = eVarSetOperationAssign); + Error + SetValueFromString(llvm::StringRef value, + VarSetOperationType op = eVarSetOperationAssign) override; - virtual bool - Clear () + bool + Clear() override { m_uuid.Clear(); m_value_was_set = false; return true; } - virtual lldb::OptionValueSP - DeepCopy () const; + lldb::OptionValueSP + DeepCopy() const override; //--------------------------------------------------------------------- // Subclass specific functions @@ -89,13 +88,13 @@ public: m_uuid = value; } - virtual size_t - AutoComplete (CommandInterpreter &interpreter, - const char *s, - int match_start_point, - int max_return_elements, - bool &word_complete, - StringList &matches); + size_t + AutoComplete(CommandInterpreter &interpreter, + const char *s, + int match_start_point, + int max_return_elements, + bool &word_complete, + StringList &matches) override; protected: UUID m_uuid; @@ -103,4 +102,4 @@ protected: } // namespace lldb_private -#endif // liblldb_OptionValueUUID_h_ +#endif // liblldb_OptionValueUUID_h_ _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
