Skip to content

Commit

Permalink
Fix Clang-tidy misc-use-override warnings in some files in include/ll…
Browse files Browse the repository at this point in the history
…db/Interpreter, unify closing inclusion guards

patch by Eugene Zelenko.

Differential Revision: http://reviews.llvm.org/D12171

llvm-svn: 246627
  • Loading branch information
labath committed Sep 2, 2015
1 parent 6ac50bf commit 4407b8e
Show file tree
Hide file tree
Showing 19 changed files with 290 additions and 310 deletions.
41 changes: 20 additions & 21 deletions lldb/include/lldb/Interpreter/OptionValueArch.h
Expand Up @@ -52,46 +52,45 @@ class OptionValueArch : public OptionValue
{
}

virtual
~OptionValueArch()
~OptionValueArch() override
{
}

//---------------------------------------------------------------------
// 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
Expand Down Expand Up @@ -136,4 +135,4 @@ class OptionValueArch : public OptionValue

} // namespace lldb_private

#endif // liblldb_OptionValueArch_h_
#endif // liblldb_OptionValueArch_h_
9 changes: 4 additions & 5 deletions lldb/include/lldb/Interpreter/OptionValueArgs.h
Expand Up @@ -26,21 +26,20 @@ class OptionValueArgs : public OptionValueArray
{
}

virtual
~OptionValueArgs()
~OptionValueArgs() override
{
}

size_t
GetArgs (Args &args);

virtual Type
GetType() const
Type
GetType() const override
{
return eTypeArgs;
}
};

} // namespace lldb_private

#endif // liblldb_OptionValueArgs_h_
#endif // liblldb_OptionValueArgs_h_
41 changes: 20 additions & 21 deletions lldb/include/lldb/Interpreter/OptionValueArray.h
Expand Up @@ -30,50 +30,49 @@ class OptionValueArray : public OptionValue
{
}

virtual
~OptionValueArray()
~OptionValueArray() override
{
}

//---------------------------------------------------------------------
// 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
Expand Down Expand Up @@ -175,4 +174,4 @@ class OptionValueArray : public OptionValue

} // namespace lldb_private

#endif // liblldb_OptionValueArray_h_
#endif // liblldb_OptionValueArray_h_
41 changes: 20 additions & 21 deletions lldb/include/lldb/Interpreter/OptionValueBoolean.h
Expand Up @@ -35,43 +35,42 @@ class OptionValueBoolean : public OptionValue
{
}

virtual
~OptionValueBoolean()
~OptionValueBoolean() override
{
}

//---------------------------------------------------------------------
// 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
Expand Down Expand Up @@ -128,8 +127,8 @@ class OptionValueBoolean : public OptionValue
m_default_value = value;
}

virtual lldb::OptionValueSP
DeepCopy () const;
lldb::OptionValueSP
DeepCopy() const override;

protected:
bool m_current_value;
Expand All @@ -138,4 +137,4 @@ class OptionValueBoolean : public OptionValue

} // namespace lldb_private

#endif // liblldb_OptionValueBoolean_h_
#endif // liblldb_OptionValueBoolean_h_
28 changes: 14 additions & 14 deletions lldb/include/lldb/Interpreter/OptionValueChar.h
Expand Up @@ -27,6 +27,7 @@ class OptionValueChar : public OptionValue
m_default_value (value)
{
}

OptionValueChar (char current_value,
char default_value) :
OptionValue(),
Expand All @@ -35,30 +36,29 @@ class OptionValueChar : public OptionValue
{
}

virtual
~OptionValueChar()
~OptionValueChar() override
{
}

//---------------------------------------------------------------------
// 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;
Expand Down Expand Up @@ -100,8 +100,8 @@ class OptionValueChar : public OptionValue
m_default_value = value;
}

virtual lldb::OptionValueSP
DeepCopy () const;
lldb::OptionValueSP
DeepCopy() const override;

protected:
char m_current_value;
Expand All @@ -110,4 +110,4 @@ class OptionValueChar : public OptionValue

} // namespace lldb_private

#endif // liblldb_OptionValueChar_h_
#endif // liblldb_OptionValueChar_h_

0 comments on commit 4407b8e

Please sign in to comment.