[lldb-mi] Use 'override' on overridden virtual methods.

Summary: [lldb-mi] Use 'override' on overridden virtual methods.

Reviewers: abidh, ki.stfu

Subscribers: lldb-commits

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

llvm-svn: 241457

59 files changed, 357 insertions, 357 deletions

diff --git a/lldb/tools/lldb-mi/MICmdArgValBase.h b/lldb/tools/lldb-mi/MICmdArgValBase.h
index 0d0eedd6e5b..3aaae499e5f 100644
--- a/lldb/tools/lldb-mi/MICmdArgValBase.h
+++ b/lldb/tools/lldb-mi/MICmdArgValBase.h
@@ -43,18 +43,18 @@ class CMICmdArgValBase : public CMICmdArgSet::IArg
 
     // Overrideable:
   public:
-    /* dtor */ virtual ~CMICmdArgValBase(void);
+    /* dtor */ ~CMICmdArgValBase(void) override;
 
     // Overridden:
   public:
     // From CMICmdArgSet::IArg
-    virtual bool GetFound(void) const;
-    virtual bool GetIsHandledByCmd(void) const;
-    virtual bool GetIsMandatory(void) const;
-    virtual bool GetIsMissingOptions(void) const;
-    virtual const CMIUtilString &GetName(void) const;
-    virtual bool GetValid(void) const;
-    virtual bool Validate(CMICmdArgContext &vwArgContext);
+    bool GetFound(void) const override;
+    bool GetIsHandledByCmd(void) const override;
+    bool GetIsMandatory(void) const override;
+    bool GetIsMissingOptions(void) const override;
+    const CMIUtilString &GetName(void) const override;
+    bool GetValid(void) const override;
+    bool Validate(CMICmdArgContext &vwArgContext) override;
 
     // Attributes:
   protected:
diff --git a/lldb/tools/lldb-mi/MICmdArgValConsume.h b/lldb/tools/lldb-mi/MICmdArgValConsume.h
index 1d37b79eba1..75768ff52e6 100644
--- a/lldb/tools/lldb-mi/MICmdArgValConsume.h
+++ b/lldb/tools/lldb-mi/MICmdArgValConsume.h
@@ -45,7 +45,7 @@ class CMICmdArgValConsume : public CMICmdArgValBaseTemplate<CMIUtilString>
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValConsume(void);
+    /* dtor */ ~CMICmdArgValConsume(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vwArgContext);
+    bool Validate(CMICmdArgContext &vwArgContext) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdArgValFile.h b/lldb/tools/lldb-mi/MICmdArgValFile.h
index 196f21fb3b3..07abc4baa24 100644
--- a/lldb/tools/lldb-mi/MICmdArgValFile.h
+++ b/lldb/tools/lldb-mi/MICmdArgValFile.h
@@ -39,9 +39,9 @@ class CMICmdArgValFile : public CMICmdArgValBaseTemplate<CMIUtilString>
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValFile(void);
+    /* dtor */ ~CMICmdArgValFile(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vwArgContext);
+    bool Validate(CMICmdArgContext &vwArgContext) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdArgValListBase.h b/lldb/tools/lldb-mi/MICmdArgValListBase.h
index 153af814dcf..f0135620321 100644
--- a/lldb/tools/lldb-mi/MICmdArgValListBase.h
+++ b/lldb/tools/lldb-mi/MICmdArgValListBase.h
@@ -75,7 +75,7 @@ class CMICmdArgValListBase : public CMICmdArgValBaseTemplate<std::vector<CMICmdA
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValListBase(void);
+    /* dtor */ ~CMICmdArgValListBase(void) override;
 
     // Methods:
   protected:
diff --git a/lldb/tools/lldb-mi/MICmdArgValListOfN.h b/lldb/tools/lldb-mi/MICmdArgValListOfN.h
index 356b494c089..496bc658111 100644
--- a/lldb/tools/lldb-mi/MICmdArgValListOfN.h
+++ b/lldb/tools/lldb-mi/MICmdArgValListOfN.h
@@ -49,9 +49,9 @@ class CMICmdArgValListOfN : public CMICmdArgValListBase
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValListOfN(void);
+    /* dtor */ ~CMICmdArgValListOfN(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vArgContext);
+    bool Validate(CMICmdArgContext &vArgContext) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdArgValNumber.h b/lldb/tools/lldb-mi/MICmdArgValNumber.h
index fea94b698f7..58a28b379e3 100644
--- a/lldb/tools/lldb-mi/MICmdArgValNumber.h
+++ b/lldb/tools/lldb-mi/MICmdArgValNumber.h
@@ -52,9 +52,9 @@ class CMICmdArgValNumber : public CMICmdArgValBaseTemplate<MIint64>
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValNumber(void);
+    /* dtor */ ~CMICmdArgValNumber(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vwArgContext);
+    bool Validate(CMICmdArgContext &vwArgContext) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdArgValOptionLong.h b/lldb/tools/lldb-mi/MICmdArgValOptionLong.h
index ace939b64f8..ac55c47fb7a 100644
--- a/lldb/tools/lldb-mi/MICmdArgValOptionLong.h
+++ b/lldb/tools/lldb-mi/MICmdArgValOptionLong.h
@@ -46,9 +46,9 @@ class CMICmdArgValOptionLong : public CMICmdArgValListBase
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValOptionLong(void);
+    /* dtor */ ~CMICmdArgValOptionLong(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vArgContext);
+    bool Validate(CMICmdArgContext &vArgContext) override;
 
     // Methods:
   protected:
diff --git a/lldb/tools/lldb-mi/MICmdArgValOptionShort.h b/lldb/tools/lldb-mi/MICmdArgValOptionShort.h
index 971a0d3a148..9157b37bb8d 100644
--- a/lldb/tools/lldb-mi/MICmdArgValOptionShort.h
+++ b/lldb/tools/lldb-mi/MICmdArgValOptionShort.h
@@ -44,11 +44,11 @@ class CMICmdArgValOptionShort : public CMICmdArgValOptionLong
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValOptionShort(void);
+    /* dtor */ ~CMICmdArgValOptionShort(void) override;
 
     // Overridden:
   private:
     // From CMICmdArgValOptionLong
-    virtual bool IsArgOptionCorrect(const CMIUtilString &vrTxt) const;
-    virtual bool ArgNameMatch(const CMIUtilString &vrTxt) const;
+    bool IsArgOptionCorrect(const CMIUtilString &vrTxt) const override;
+    bool ArgNameMatch(const CMIUtilString &vrTxt) const override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdArgValPrintValues.h b/lldb/tools/lldb-mi/MICmdArgValPrintValues.h
index 37de923e9e5..9ac3238aeb7 100644
--- a/lldb/tools/lldb-mi/MICmdArgValPrintValues.h
+++ b/lldb/tools/lldb-mi/MICmdArgValPrintValues.h
@@ -38,9 +38,9 @@ class CMICmdArgValPrintValues : public CMICmdArgValBaseTemplate<MIuint>
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValPrintValues(void);
+    /* dtor */ ~CMICmdArgValPrintValues(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vArgContext);
+    bool Validate(CMICmdArgContext &vArgContext) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdArgValString.h b/lldb/tools/lldb-mi/MICmdArgValString.h
index 54051d61591..8b58a0a88dd 100644
--- a/lldb/tools/lldb-mi/MICmdArgValString.h
+++ b/lldb/tools/lldb-mi/MICmdArgValString.h
@@ -41,9 +41,9 @@ class CMICmdArgValString : public CMICmdArgValBaseTemplate<CMIUtilString>
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValString(void);
+    /* dtor */ ~CMICmdArgValString(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vrwArgContext);
+    bool Validate(CMICmdArgContext &vrwArgContext) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdArgValThreadGrp.h b/lldb/tools/lldb-mi/MICmdArgValThreadGrp.h
index d361f3a8747..64c11405e8a 100644
--- a/lldb/tools/lldb-mi/MICmdArgValThreadGrp.h
+++ b/lldb/tools/lldb-mi/MICmdArgValThreadGrp.h
@@ -39,9 +39,9 @@ class CMICmdArgValThreadGrp : public CMICmdArgValBaseTemplate<MIuint>
     // Overridden:
   public:
     // From CMICmdArgValBase
-    /* dtor */ virtual ~CMICmdArgValThreadGrp(void);
+    /* dtor */ ~CMICmdArgValThreadGrp(void) override;
     // From CMICmdArgSet::IArg
-    virtual bool Validate(CMICmdArgContext &vArgContext);
+    bool Validate(CMICmdArgContext &vArgContext) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmd.h b/lldb/tools/lldb-mi/MICmdCmd.h
index a360ad6a56a..26697643c5e 100644
--- a/lldb/tools/lldb-mi/MICmdCmd.h
+++ b/lldb/tools/lldb-mi/MICmdCmd.h
@@ -59,10 +59,10 @@ class CMICmdCmdEnablePrettyPrinting : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdEnablePrettyPrinting(void);
+    /* dtor */ ~CMICmdCmdEnablePrettyPrinting(void) override;
 };
 
 //++ ============================================================================
@@ -86,8 +86,8 @@ class CMICmdCmdSource : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdSource(void);
+    /* dtor */ ~CMICmdCmdSource(void) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdCmdBreak.h b/lldb/tools/lldb-mi/MICmdCmdBreak.h
index 06a3434ca5b..476ab45762d 100644
--- a/lldb/tools/lldb-mi/MICmdCmdBreak.h
+++ b/lldb/tools/lldb-mi/MICmdCmdBreak.h
@@ -53,11 +53,11 @@ class CMICmdCmdBreakInsert : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdBreakInsert(void);
+    /* dtor */ ~CMICmdCmdBreakInsert(void) override;
 
     // Enumerations:
   private:
@@ -122,11 +122,11 @@ class CMICmdCmdBreakDelete : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdBreakDelete(void);
+    /* dtor */ ~CMICmdCmdBreakDelete(void) override;
 
     // Attributes:
   private:
@@ -155,11 +155,11 @@ class CMICmdCmdBreakDisable : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdBreakDisable(void);
+    /* dtor */ ~CMICmdCmdBreakDisable(void) override;
 
     // Attributes:
   private:
@@ -190,11 +190,11 @@ class CMICmdCmdBreakEnable : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdBreakEnable(void);
+    /* dtor */ ~CMICmdCmdBreakEnable(void) override;
 
     // Attributes:
   private:
@@ -225,11 +225,11 @@ class CMICmdCmdBreakAfter : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdBreakAfter(void);
+    /* dtor */ ~CMICmdCmdBreakAfter(void) override;
 
     // Attributes:
   private:
@@ -261,11 +261,11 @@ class CMICmdCmdBreakCondition : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdBreakCondition(void);
+    /* dtor */ ~CMICmdCmdBreakCondition(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdData.h b/lldb/tools/lldb-mi/MICmdCmdData.h
index 11873e9cbe4..576441024a3 100644
--- a/lldb/tools/lldb-mi/MICmdCmdData.h
+++ b/lldb/tools/lldb-mi/MICmdCmdData.h
@@ -60,11 +60,11 @@ class CMICmdCmdDataEvaluateExpression : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataEvaluateExpression(void);
+    /* dtor */ ~CMICmdCmdDataEvaluateExpression(void) override;
 
     // Methods:
   private:
@@ -105,11 +105,11 @@ class CMICmdCmdDataDisassemble : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataDisassemble(void);
+    /* dtor */ ~CMICmdCmdDataDisassemble(void) override;
 
     // Attributes:
   private:
@@ -142,11 +142,11 @@ class CMICmdCmdDataReadMemoryBytes : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataReadMemoryBytes(void);
+    /* dtor */ ~CMICmdCmdDataReadMemoryBytes(void) override;
 
     // Attributes:
   private:
@@ -181,10 +181,10 @@ class CMICmdCmdDataReadMemory : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataReadMemory(void);
+    /* dtor */ ~CMICmdCmdDataReadMemory(void) override;
 };
 
 //++ ============================================================================
@@ -208,11 +208,11 @@ class CMICmdCmdDataListRegisterNames : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataListRegisterNames(void);
+    /* dtor */ ~CMICmdCmdDataListRegisterNames(void) override;
 
     // Methods:
   private:
@@ -246,11 +246,11 @@ class CMICmdCmdDataListRegisterValues : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataListRegisterValues(void);
+    /* dtor */ ~CMICmdCmdDataListRegisterValues(void) override;
 
     // Methods:
   private:
@@ -287,10 +287,10 @@ class CMICmdCmdDataListRegisterChanged : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataListRegisterChanged(void);
+    /* dtor */ ~CMICmdCmdDataListRegisterChanged(void) override;
 };
 
 //++ ============================================================================
@@ -314,11 +314,11 @@ class CMICmdCmdDataWriteMemoryBytes : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataWriteMemoryBytes(void);
+    /* dtor */ ~CMICmdCmdDataWriteMemoryBytes(void) override;
 
     // Attributes:
   private:
@@ -351,11 +351,11 @@ class CMICmdCmdDataWriteMemory : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataWriteMemory(void);
+    /* dtor */ ~CMICmdCmdDataWriteMemory(void) override;
 
     // Attributes:
   private:
@@ -390,11 +390,11 @@ class CMICmdCmdDataInfoLine : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdDataInfoLine(void);
+    /* dtor */ ~CMICmdCmdDataInfoLine(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdEnviro.h b/lldb/tools/lldb-mi/MICmdCmdEnviro.h
index 1fb699e989b..7d5cf98dd4b 100644
--- a/lldb/tools/lldb-mi/MICmdCmdEnviro.h
+++ b/lldb/tools/lldb-mi/MICmdCmdEnviro.h
@@ -46,11 +46,11 @@ class CMICmdCmdEnvironmentCd : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdEnvironmentCd(void);
+    /* dtor */ ~CMICmdCmdEnvironmentCd(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdExec.h b/lldb/tools/lldb-mi/MICmdCmdExec.h
index 8889fb96402..94d646fd832 100644
--- a/lldb/tools/lldb-mi/MICmdCmdExec.h
+++ b/lldb/tools/lldb-mi/MICmdCmdExec.h
@@ -56,10 +56,10 @@ class CMICmdCmdExecRun : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecRun(void);
+    /* dtor */ ~CMICmdCmdExecRun(void) override;
 
     // Attributes:
   private:
@@ -87,10 +87,10 @@ class CMICmdCmdExecContinue : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecContinue(void);
+    /* dtor */ ~CMICmdCmdExecContinue(void) override;
 
     // Attributes:
   private:
@@ -118,11 +118,11 @@ class CMICmdCmdExecNext : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecNext(void);
+    /* dtor */ ~CMICmdCmdExecNext(void) override;
 
     // Attributes:
   private:
@@ -152,11 +152,11 @@ class CMICmdCmdExecStep : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecStep(void);
+    /* dtor */ ~CMICmdCmdExecStep(void) override;
 
     // Attributes:
   private:
@@ -186,11 +186,11 @@ class CMICmdCmdExecNextInstruction : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecNextInstruction(void);
+    /* dtor */ ~CMICmdCmdExecNextInstruction(void) override;
 
     // Attributes:
   private:
@@ -220,11 +220,11 @@ class CMICmdCmdExecStepInstruction : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecStepInstruction(void);
+    /* dtor */ ~CMICmdCmdExecStepInstruction(void) override;
 
     // Attributes:
   private:
@@ -254,11 +254,11 @@ class CMICmdCmdExecFinish : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecFinish(void);
+    /* dtor */ ~CMICmdCmdExecFinish(void) override;
 
     // Attributes:
   private:
@@ -290,10 +290,10 @@ class CMICmdCmdExecInterrupt : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecInterrupt(void);
+    /* dtor */ ~CMICmdCmdExecInterrupt(void) override;
 
     // Attributes:
   private:
@@ -321,11 +321,11 @@ class CMICmdCmdExecArguments : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecArguments(void);
+    /* dtor */ ~CMICmdCmdExecArguments(void) override;
 
     // Attributes:
   private:
@@ -350,8 +350,8 @@ class CMICmdCmdExecAbort : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdExecAbort(void);
+    /* dtor */ ~CMICmdCmdExecAbort(void) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdCmdFile.h b/lldb/tools/lldb-mi/MICmdCmdFile.h
index 307f4f887aa..9fa14f19bc0 100644
--- a/lldb/tools/lldb-mi/MICmdCmdFile.h
+++ b/lldb/tools/lldb-mi/MICmdCmdFile.h
@@ -48,12 +48,12 @@ class CMICmdCmdFileExecAndSymbols : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdFileExecAndSymbols(void);
-    virtual bool GetExitAppOnCommandFailure(void) const;
+    /* dtor */ ~CMICmdCmdFileExecAndSymbols(void) override;
+    bool GetExitAppOnCommandFailure(void) const override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.h b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.h
index eb60f8277c0..a1b5770e200 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.h
+++ b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.h
@@ -55,11 +55,11 @@ class CMICmdCmdGdbInfo : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdGdbInfo(void);
+    /* dtor */ ~CMICmdCmdGdbInfo(void) override;
 
     // Typedefs:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbSet.h b/lldb/tools/lldb-mi/MICmdCmdGdbSet.h
index 0095f81838d..84d21f0557b 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbSet.h
+++ b/lldb/tools/lldb-mi/MICmdCmdGdbSet.h
@@ -55,11 +55,11 @@ class CMICmdCmdGdbSet : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdGdbSet(void);
+    /* dtor */ ~CMICmdCmdGdbSet(void) override;
 
     // Typedefs:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbShow.h b/lldb/tools/lldb-mi/MICmdCmdGdbShow.h
index 5cb4cb58f80..6ca5ef8781a 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbShow.h
+++ b/lldb/tools/lldb-mi/MICmdCmdGdbShow.h
@@ -52,11 +52,11 @@ class CMICmdCmdGdbShow : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdGdbShow(void);
+    /* dtor */ ~CMICmdCmdGdbShow(void) override;
 
     // Typedefs:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbThread.h b/lldb/tools/lldb-mi/MICmdCmdGdbThread.h
index a4b8596a47c..6a3804a1c89 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbThread.h
+++ b/lldb/tools/lldb-mi/MICmdCmdGdbThread.h
@@ -44,8 +44,8 @@ class CMICmdCmdGdbThread : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdGdbThread(void);
+    /* dtor */ ~CMICmdCmdGdbThread(void) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h
index ffc691cdc92..876554981e3 100644
--- a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h
+++ b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h
@@ -52,10 +52,10 @@ class CMICmdCmdGdbExit : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdGdbExit(void);
+    /* dtor */ ~CMICmdCmdGdbExit(void) override;
 };
 
 //++ ============================================================================
@@ -81,11 +81,11 @@ class CMICmdCmdListThreadGroups : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdListThreadGroups(void);
+    /* dtor */ ~CMICmdCmdListThreadGroups(void) override;
 
     // Typedefs:
   private:
@@ -124,11 +124,11 @@ class CMICmdCmdInterpreterExec : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdInterpreterExec(void);
+    /* dtor */ ~CMICmdCmdInterpreterExec(void) override;
 
     // Attributes:
   private:
@@ -158,8 +158,8 @@ class CMICmdCmdInferiorTtySet : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdInferiorTtySet(void);
+    /* dtor */ ~CMICmdCmdInferiorTtySet(void) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdCmdStack.h b/lldb/tools/lldb-mi/MICmdCmdStack.h
index ed141fcf942..274415aaafc 100644
--- a/lldb/tools/lldb-mi/MICmdCmdStack.h
+++ b/lldb/tools/lldb-mi/MICmdCmdStack.h
@@ -51,11 +51,11 @@ class CMICmdCmdStackInfoDepth : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdStackInfoDepth(void);
+    /* dtor */ ~CMICmdCmdStackInfoDepth(void) override;
 
     // Attributes:
   private:
@@ -82,11 +82,11 @@ class CMICmdCmdStackInfoFrame : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdStackInfoFrame(void);
+    /* dtor */ ~CMICmdCmdStackInfoFrame(void) override;
 
     // Attributes:
   private:
@@ -114,11 +114,11 @@ class CMICmdCmdStackListFrames : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdStackListFrames(void);
+    /* dtor */ ~CMICmdCmdStackListFrames(void) override;
 
     // Typedefs:
   private:
@@ -154,11 +154,11 @@ class CMICmdCmdStackListArguments : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdStackListArguments(void);
+    /* dtor */ ~CMICmdCmdStackListArguments(void) override;
 
     // Attributes:
   private:
@@ -191,11 +191,11 @@ class CMICmdCmdStackListLocals : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdStackListLocals(void);
+    /* dtor */ ~CMICmdCmdStackListLocals(void) override;
 
     // Attributes:
   private:
@@ -224,11 +224,11 @@ public:
     // Overridden:
 public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdStackListVariables(void);
+    /* dtor */ ~CMICmdCmdStackListVariables(void) override;
     
     // Attributes
 private:
@@ -257,11 +257,11 @@ class CMICmdCmdStackSelectFrame : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdStackSelectFrame(void);
+    /* dtor */ ~CMICmdCmdStackSelectFrame(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdSupportInfo.h b/lldb/tools/lldb-mi/MICmdCmdSupportInfo.h
index a8c22526484..8dfcfba8ed7 100644
--- a/lldb/tools/lldb-mi/MICmdCmdSupportInfo.h
+++ b/lldb/tools/lldb-mi/MICmdCmdSupportInfo.h
@@ -45,11 +45,11 @@ class CMICmdCmdSupportInfoMiCmdQuery : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdSupportInfoMiCmdQuery(void);
+    /* dtor */ ~CMICmdCmdSupportInfoMiCmdQuery(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdSupportList.h b/lldb/tools/lldb-mi/MICmdCmdSupportList.h
index 16c140bca34..a317b079247 100644
--- a/lldb/tools/lldb-mi/MICmdCmdSupportList.h
+++ b/lldb/tools/lldb-mi/MICmdCmdSupportList.h
@@ -45,8 +45,8 @@ class CMICmdCmdSupportListFeatures : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdSupportListFeatures(void);
+    /* dtor */ ~CMICmdCmdSupportListFeatures(void) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdCmdSymbol.h b/lldb/tools/lldb-mi/MICmdCmdSymbol.h
index 449d8aed81b..ef268bbdb59 100644
--- a/lldb/tools/lldb-mi/MICmdCmdSymbol.h
+++ b/lldb/tools/lldb-mi/MICmdCmdSymbol.h
@@ -44,11 +44,11 @@ class CMICmdCmdSymbolListLines : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdSymbolListLines(void);
+    /* dtor */ ~CMICmdCmdSymbolListLines(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdTarget.h b/lldb/tools/lldb-mi/MICmdCmdTarget.h
index b3810305d4d..62f77eed47c 100644
--- a/lldb/tools/lldb-mi/MICmdCmdTarget.h
+++ b/lldb/tools/lldb-mi/MICmdCmdTarget.h
@@ -47,11 +47,11 @@ class CMICmdCmdTargetSelect : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdTargetSelect(void);
+    /* dtor */ ~CMICmdCmdTargetSelect(void) override;
 
     // Attributes:
   private:
@@ -78,11 +78,11 @@ public:
     // Overridden:
 public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdTargetAttach(void);
+    /* dtor */ ~CMICmdCmdTargetAttach(void) override;
     
     // Attributes:
 private:
@@ -110,10 +110,10 @@ public:
     // Overridden:
 public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdTargetDetach(void);
+    /* dtor */ ~CMICmdCmdTargetDetach(void) override;
 };
 
diff --git a/lldb/tools/lldb-mi/MICmdCmdThread.h b/lldb/tools/lldb-mi/MICmdCmdThread.h
index 6b268f40e8e..7bce823a0b2 100644
--- a/lldb/tools/lldb-mi/MICmdCmdThread.h
+++ b/lldb/tools/lldb-mi/MICmdCmdThread.h
@@ -46,11 +46,11 @@ class CMICmdCmdThreadInfo : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdThreadInfo(void);
+    /* dtor */ ~CMICmdCmdThreadInfo(void) override;
 
     // Typedefs:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdCmdTrace.h b/lldb/tools/lldb-mi/MICmdCmdTrace.h
index c9a6f72a379..cafe2d89420 100644
--- a/lldb/tools/lldb-mi/MICmdCmdTrace.h
+++ b/lldb/tools/lldb-mi/MICmdCmdTrace.h
@@ -44,8 +44,8 @@ class CMICmdCmdTraceStatus : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdTraceStatus(void);
+    /* dtor */ ~CMICmdCmdTraceStatus(void) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmdCmdVar.h b/lldb/tools/lldb-mi/MICmdCmdVar.h
index b6b65726eb8..9f5ad1c3a11 100644
--- a/lldb/tools/lldb-mi/MICmdCmdVar.h
+++ b/lldb/tools/lldb-mi/MICmdCmdVar.h
@@ -59,14 +59,14 @@ class CMICmdCmdVarCreate : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
 
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarCreate(void);
+    /* dtor */ ~CMICmdCmdVarCreate(void) override;
 
     // Methods:
   private:
@@ -110,14 +110,14 @@ class CMICmdCmdVarUpdate : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
 
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarUpdate(void);
+    /* dtor */ ~CMICmdCmdVarUpdate(void) override;
 
     // Methods:
   private:
@@ -153,11 +153,11 @@ class CMICmdCmdVarDelete : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarDelete(void);
+    /* dtor */ ~CMICmdCmdVarDelete(void) override;
 
     // Attribute:
   private:
@@ -185,11 +185,11 @@ class CMICmdCmdVarAssign : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarAssign(void);
+    /* dtor */ ~CMICmdCmdVarAssign(void) override;
 
     // Attributes:
   private:
@@ -220,11 +220,11 @@ class CMICmdCmdVarSetFormat : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarSetFormat(void);
+    /* dtor */ ~CMICmdCmdVarSetFormat(void) override;
 
     // Attributes:
   private:
@@ -254,11 +254,11 @@ class CMICmdCmdVarListChildren : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarListChildren(void);
+    /* dtor */ ~CMICmdCmdVarListChildren(void) override;
 
     // Attributes:
   private:
@@ -293,11 +293,11 @@ class CMICmdCmdVarEvaluateExpression : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarEvaluateExpression(void);
+    /* dtor */ ~CMICmdCmdVarEvaluateExpression(void) override;
 
     // Attributes:
   private:
@@ -328,11 +328,11 @@ class CMICmdCmdVarInfoPathExpression : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarInfoPathExpression(void);
+    /* dtor */ ~CMICmdCmdVarInfoPathExpression(void) override;
 
     // Attributes:
   private:
@@ -362,11 +362,11 @@ class CMICmdCmdVarShowAttributes : public CMICmdBase
     // Overridden:
   public:
     // From CMICmdInvoker::ICmd
-    virtual bool Execute(void);
-    virtual bool Acknowledge(void);
-    virtual bool ParseArgs(void);
+    bool Execute(void) override;
+    bool Acknowledge(void) override;
+    bool ParseArgs(void) override;
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdCmdVarShowAttributes(void);
+    /* dtor */ ~CMICmdCmdVarShowAttributes(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdFactory.h b/lldb/tools/lldb-mi/MICmdFactory.h
index 8ad64fb5eaf..9a5e07690a3 100644
--- a/lldb/tools/lldb-mi/MICmdFactory.h
+++ b/lldb/tools/lldb-mi/MICmdFactory.h
@@ -55,8 +55,8 @@ class CMICmdFactory : public CMICmnBase, public MI::ISingleton<CMICmdFactory>
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     bool CmdRegister(const CMIUtilString &vMiCmd, CmdCreatorFnPtr vCmdCreateFn);
     bool CmdCreate(const CMIUtilString &vMiCmd, const SMICmdData &vCmdData, CMICmdBase *&vpNewCmd);
     bool CmdExist(const CMIUtilString &vMiCmd) const;
@@ -73,7 +73,7 @@ class CMICmdFactory : public CMICmnBase, public MI::ISingleton<CMICmdFactory>
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdFactory(void);
+    /* dtor */ ~CMICmdFactory(void) override;
 
     // Typedefs:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdInterpreter.h b/lldb/tools/lldb-mi/MICmdInterpreter.h
index acb052289ba..e24308484d2 100644
--- a/lldb/tools/lldb-mi/MICmdInterpreter.h
+++ b/lldb/tools/lldb-mi/MICmdInterpreter.h
@@ -35,8 +35,8 @@ class CMICmdInterpreter : public CMICmnBase, public MI::ISingleton<CMICmdInterpr
   public:
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     bool ValidateIsMi(const CMIUtilString &vTextLine, bool &vwbYesValid, bool &vwbCmdNotInCmdFactor, SMICmdData &rwCmdData);
 
     // Methods:
@@ -55,7 +55,7 @@ class CMICmdInterpreter : public CMICmnBase, public MI::ISingleton<CMICmdInterpr
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdInterpreter(void);
+    /* dtor */ ~CMICmdInterpreter(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdInvoker.h b/lldb/tools/lldb-mi/MICmdInvoker.h
index a03c2d36103..74dbaff874e 100644
--- a/lldb/tools/lldb-mi/MICmdInvoker.h
+++ b/lldb/tools/lldb-mi/MICmdInvoker.h
@@ -68,8 +68,8 @@ class CMICmdInvoker : public CMICmnBase, public CMICmdMgrSetCmdDeleteCallback::I
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     bool CmdExecute(CMICmdBase &vCmd);
     bool CmdExecuteFinished(CMICmdBase &vCmd);
 
@@ -92,9 +92,9 @@ class CMICmdInvoker : public CMICmnBase, public CMICmdMgrSetCmdDeleteCallback::I
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdInvoker(void);
+    /* dtor */ ~CMICmdInvoker(void) override;
     // From CMICmdMgrSetCmdDeleteCallback::ICallback
-    virtual void Delete(SMICmdData &vCmd);
+    void Delete(SMICmdData &vCmd) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdMgr.h b/lldb/tools/lldb-mi/MICmdMgr.h
index 6cc7af3a6e9..4956d5c3a37 100644
--- a/lldb/tools/lldb-mi/MICmdMgr.h
+++ b/lldb/tools/lldb-mi/MICmdMgr.h
@@ -40,8 +40,8 @@ class CMICmdMgr : public CMICmnBase, public MI::ISingleton<CMICmdMgr>
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
 
     bool CmdInterpret(const CMIUtilString &vTextLine, bool &vwbYesValid, bool &vwbCmdNotInCmdFactor, SMICmdData &rwCmdData);
     bool CmdExecute(const SMICmdData &vCmdData);
@@ -58,7 +58,7 @@ class CMICmdMgr : public CMICmnBase, public MI::ISingleton<CMICmdMgr>
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmdMgr(void);
+    /* dtor */ ~CMICmdMgr(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h b/lldb/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h
index 16b11e5d0f4..1c9be826c51 100644
--- a/lldb/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h
+++ b/lldb/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h
@@ -64,7 +64,7 @@ class CSetClients : public std::set<class ICallback *>, public CMICmnBase
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CSetClients(void);
+    /* dtor */ ~CSetClients(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h b/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h
index 469aae969b9..6987437b6e8 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h
@@ -31,8 +31,8 @@ class CMICmnLLDBBroadcaster : public CMICmnBase, public lldb::SBBroadcaster, pub
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     // Methods:
   private:
     /* ctor */ CMICmnLLDBBroadcaster(void);
@@ -42,5 +42,5 @@ class CMICmnLLDBBroadcaster : public CMICmnBase, public lldb::SBBroadcaster, pub
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnLLDBBroadcaster(void);
+    /* dtor */ ~CMICmnLLDBBroadcaster(void) override;
 };
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h
index e3e16cd2ca5..8969f2c67bf 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h
@@ -140,8 +140,8 @@ class CMICmnLLDBDebugSessionInfo : public CMICmnBase, public MI::ISingleton<CMIC
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
 
     // Variant type data which can be assigned and retrieved across all command instances
     template <typename T> bool SharedDataAdd(const CMIUtilString &vKey, const T &vData);
@@ -209,7 +209,7 @@ class CMICmnLLDBDebugSessionInfo : public CMICmnBase, public MI::ISingleton<CMIC
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnLLDBDebugSessionInfo(void);
+    /* dtor */ ~CMICmnLLDBDebugSessionInfo(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugger.h b/lldb/tools/lldb-mi/MICmnLLDBDebugger.h
index 6c7e90006d8..de761122152 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugger.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugger.h
@@ -42,8 +42,8 @@ class CMICmnLLDBDebugger : public CMICmnBase, public CMIUtilThreadActiveObjBase,
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
 
     bool SetDriver(const CMIDriverBase &vClientDriver);
     CMIDriverBase &GetDriver(void) const;
@@ -62,13 +62,13 @@ class CMICmnLLDBDebugger : public CMICmnBase, public CMIUtilThreadActiveObjBase,
     // Overridden:
   public:
     // From CMIUtilThreadActiveObjBase
-    virtual const CMIUtilString &ThreadGetName(void) const;
+    const CMIUtilString &ThreadGetName(void) const override;
 
     // Overridden:
   protected:
     // From CMIUtilThreadActiveObjBase
-    virtual bool ThreadRun(bool &vrIsAlive);
-    virtual bool ThreadFinish(void);
+    bool ThreadRun(bool &vrIsAlive) override;
+    bool ThreadFinish(void) override;
 
     // Typedefs:
   private:
@@ -100,7 +100,7 @@ class CMICmnLLDBDebugger : public CMICmnBase, public CMIUtilThreadActiveObjBase,
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnLLDBDebugger(void);
+    /* dtor */ ~CMICmnLLDBDebugger(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h
index 9b7b5d6f7b0..1abb5201297 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h
@@ -36,8 +36,8 @@ class CMICmnLLDBDebuggerHandleEvents : public CMICmnBase, public MI::ISingleton<
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     //
     bool HandleEvent(const lldb::SBEvent &vEvent, bool &vrbHandledEvent);
 
@@ -84,7 +84,7 @@ class CMICmnLLDBDebuggerHandleEvents : public CMICmnBase, public MI::ISingleton<
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnLLDBDebuggerHandleEvents(void);
+    /* dtor */ ~CMICmnLLDBDebuggerHandleEvents(void) override;
     void InitializeSignals();
     bool m_bSignalsInitialized;
     MIuint64 m_SIGINT;
diff --git a/lldb/tools/lldb-mi/MICmnLog.h b/lldb/tools/lldb-mi/MICmnLog.h
index 5c4bb79da43..f0ae534e840 100644
--- a/lldb/tools/lldb-mi/MICmnLog.h
+++ b/lldb/tools/lldb-mi/MICmnLog.h
@@ -93,8 +93,8 @@ class CMICmnLog : public MI::ISingleton<CMICmnLog>
     // Overridden:
   public:
     // From MI::ISingleton
-    virtual bool Initialize(void);
-    virtual bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
 
     // Methods:
   private:
@@ -105,7 +105,7 @@ class CMICmnLog : public MI::ISingleton<CMICmnLog>
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnLog(void);
+    /* dtor */ ~CMICmnLog(void) override;
 
     // Typedef:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnLogMediumFile.h b/lldb/tools/lldb-mi/MICmnLogMediumFile.h
index 53961d8f4f7..b79baf18488 100644
--- a/lldb/tools/lldb-mi/MICmnLogMediumFile.h
+++ b/lldb/tools/lldb-mi/MICmnLogMediumFile.h
@@ -48,13 +48,13 @@ class CMICmnLogMediumFile : public CMICmnBase, public CMICmnLog::IMedium
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnLogMediumFile(void);
+    /* dtor */ ~CMICmnLogMediumFile(void) override;
     // From CMICmnLog::IMedium
-    virtual bool Initialize(void);
-    virtual const CMIUtilString &GetName(void) const;
-    virtual bool Write(const CMIUtilString &vData, const CMICmnLog::ELogVerbosity veType);
-    virtual const CMIUtilString &GetError(void) const;
-    virtual bool Shutdown(void);
+    bool Initialize(void) override;
+    const CMIUtilString &GetName(void) const override;
+    bool Write(const CMIUtilString &vData, const CMICmnLog::ELogVerbosity veType) override;
+    const CMIUtilString &GetError(void) const override;
+    bool Shutdown(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnMIOutOfBandRecord.h b/lldb/tools/lldb-mi/MICmnMIOutOfBandRecord.h
index 60a67165a3f..6277e860878 100644
--- a/lldb/tools/lldb-mi/MICmnMIOutOfBandRecord.h
+++ b/lldb/tools/lldb-mi/MICmnMIOutOfBandRecord.h
@@ -86,7 +86,7 @@ class CMICmnMIOutOfBandRecord : public CMICmnBase
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnMIOutOfBandRecord(void);
+    /* dtor */ ~CMICmnMIOutOfBandRecord(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnMIResultRecord.h b/lldb/tools/lldb-mi/MICmnMIResultRecord.h
index 92666ab8773..981cf3635d5 100644
--- a/lldb/tools/lldb-mi/MICmnMIResultRecord.h
+++ b/lldb/tools/lldb-mi/MICmnMIResultRecord.h
@@ -76,7 +76,7 @@ class CMICmnMIResultRecord : public CMICmnBase
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnMIResultRecord(void);
+    /* dtor */ ~CMICmnMIResultRecord(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnMIValue.h b/lldb/tools/lldb-mi/MICmnMIValue.h
index d5de4275231..6a372e60014 100644
--- a/lldb/tools/lldb-mi/MICmnMIValue.h
+++ b/lldb/tools/lldb-mi/MICmnMIValue.h
@@ -43,7 +43,7 @@ class CMICmnMIValue : public CMICmnBase
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnMIValue(void);
+    /* dtor */ ~CMICmnMIValue(void) override;
 
     // Attributes:
   protected:
diff --git a/lldb/tools/lldb-mi/MICmnMIValueConst.h b/lldb/tools/lldb-mi/MICmnMIValueConst.h
index 72b5f2455f4..40361943891 100644
--- a/lldb/tools/lldb-mi/MICmnMIValueConst.h
+++ b/lldb/tools/lldb-mi/MICmnMIValueConst.h
@@ -45,7 +45,7 @@ class CMICmnMIValueConst : public CMICmnMIValue
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnMIValueConst(void);
+    /* dtor */ ~CMICmnMIValueConst(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnMIValueList.h b/lldb/tools/lldb-mi/MICmnMIValueList.h
index 85bc5d4fbc9..26a217dfc77 100644
--- a/lldb/tools/lldb-mi/MICmnMIValueList.h
+++ b/lldb/tools/lldb-mi/MICmnMIValueList.h
@@ -48,7 +48,7 @@ class CMICmnMIValueList : public CMICmnMIValue
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnMIValueList(void);
+    /* dtor */ ~CMICmnMIValueList(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnMIValueResult.h b/lldb/tools/lldb-mi/MICmnMIValueResult.h
index 99051bfc3f2..7c8e9801e4a 100644
--- a/lldb/tools/lldb-mi/MICmnMIValueResult.h
+++ b/lldb/tools/lldb-mi/MICmnMIValueResult.h
@@ -45,7 +45,7 @@ class CMICmnMIValueResult : public CMICmnMIValue
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnMIValueResult(void);
+    /* dtor */ ~CMICmnMIValueResult(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnMIValueTuple.h b/lldb/tools/lldb-mi/MICmnMIValueTuple.h
index 3b6a8835d25..ecf5402dc54 100644
--- a/lldb/tools/lldb-mi/MICmnMIValueTuple.h
+++ b/lldb/tools/lldb-mi/MICmnMIValueTuple.h
@@ -50,7 +50,7 @@ class CMICmnMIValueTuple : public CMICmnMIValue
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnMIValueTuple(void);
+    /* dtor */ ~CMICmnMIValueTuple(void) override;
 
     // Methods:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnResources.h b/lldb/tools/lldb-mi/MICmnResources.h
index 7e5b70fcbdd..a149e0603c7 100644
--- a/lldb/tools/lldb-mi/MICmnResources.h
+++ b/lldb/tools/lldb-mi/MICmnResources.h
@@ -289,8 +289,8 @@ class CMICmnResources : public CMICmnBase, public MI::ISingleton<CMICmnResources
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
 
     CMIUtilString GetString(const MIuint vResourceId) const;
     bool HasString(const MIuint vResourceId) const;
@@ -327,7 +327,7 @@ class CMICmnResources : public CMICmnBase, public MI::ISingleton<CMICmnResources
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnResources(void);
+    /* dtor */ ~CMICmnResources(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnStreamStderr.h b/lldb/tools/lldb-mi/MICmnStreamStderr.h
index 4f4874ebc9b..afceada9ff2 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStderr.h
+++ b/lldb/tools/lldb-mi/MICmnStreamStderr.h
@@ -35,8 +35,8 @@ class CMICmnStreamStderr : public CMICmnBase, public MI::ISingleton<CMICmnStream
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     //
     bool Lock(void);
     bool Unlock(void);
@@ -54,7 +54,7 @@ class CMICmnStreamStderr : public CMICmnBase, public MI::ISingleton<CMICmnStream
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnStreamStderr(void);
+    /* dtor */ ~CMICmnStreamStderr(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnStreamStdin.h b/lldb/tools/lldb-mi/MICmnStreamStdin.h
index 309c7d8eed2..71076d6dcd4 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStdin.h
+++ b/lldb/tools/lldb-mi/MICmnStreamStdin.h
@@ -32,8 +32,8 @@ class CMICmnStreamStdin : public CMICmnBase, public MI::ISingleton<CMICmnStreamS
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     //
     const CMIUtilString &GetPrompt(void) const;
     bool SetPrompt(const CMIUtilString &vNewPrompt);
@@ -50,7 +50,7 @@ class CMICmnStreamStdin : public CMICmnBase, public MI::ISingleton<CMICmnStreamS
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnStreamStdin(void);
+    /* dtor */ ~CMICmnStreamStdin(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnStreamStdout.h b/lldb/tools/lldb-mi/MICmnStreamStdout.h
index 526a322f6e3..664faae863d 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStdout.h
+++ b/lldb/tools/lldb-mi/MICmnStreamStdout.h
@@ -35,8 +35,8 @@ class CMICmnStreamStdout : public CMICmnBase, public MI::ISingleton<CMICmnStream
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     //
     bool Lock(void);
     bool Unlock(void);
@@ -54,7 +54,7 @@ class CMICmnStreamStdout : public CMICmnBase, public MI::ISingleton<CMICmnStream
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnStreamStdout(void);
+    /* dtor */ ~CMICmnStreamStdout(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MICmnThreadMgrStd.h b/lldb/tools/lldb-mi/MICmnThreadMgrStd.h
index 8f2d207995c..fef999b2a7b 100644
--- a/lldb/tools/lldb-mi/MICmnThreadMgrStd.h
+++ b/lldb/tools/lldb-mi/MICmnThreadMgrStd.h
@@ -35,8 +35,8 @@ class CMICmnThreadMgrStd : public CMICmnBase, public MI::ISingleton<CMICmnThread
 
     // Methods:
   public:
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     bool
     ThreadAllTerminate(void); // Ask all threads to stop (caution)
     template <typename T>     // Ask the thread manager to start and stop threads on our behalf
@@ -58,7 +58,7 @@ class CMICmnThreadMgrStd : public CMICmnBase, public MI::ISingleton<CMICmnThread
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMICmnThreadMgrStd(void);
+    /* dtor */ ~CMICmnThreadMgrStd(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MIDriver.h b/lldb/tools/lldb-mi/MIDriver.h
index 613e55458d3..55c662494e2 100644
--- a/lldb/tools/lldb-mi/MIDriver.h
+++ b/lldb/tools/lldb-mi/MIDriver.h
@@ -68,8 +68,8 @@ class CMIDriver : public CMICmnBase,
     // Methods:
   public:
     // MI system
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
 
     // MI state
     bool GetExitApplicationFlag(void) const;
@@ -94,26 +94,26 @@ class CMIDriver : public CMICmnBase,
     // Overridden:
   public:
     // From CMIDriverMgr::IDriver
-    virtual bool DoInitialize(void);
-    virtual bool DoShutdown(void);
-    virtual bool DoMainLoop(void);
-    virtual lldb::SBError DoParseArgs(const int argc, const char *argv[], FILE *vpStdOut, bool &vwbExiting);
-    virtual CMIUtilString GetError(void) const;
-    virtual const CMIUtilString &GetName(void) const;
-    virtual lldb::SBDebugger &GetTheDebugger(void);
-    virtual bool GetDriverIsGDBMICompatibleDriver(void) const;
-    virtual bool SetId(const CMIUtilString &vId);
-    virtual const CMIUtilString &GetId(void) const;
+    bool DoInitialize(void) override;
+    bool DoShutdown(void) override;
+    bool DoMainLoop(void) override;
+    lldb::SBError DoParseArgs(const int argc, const char *argv[], FILE *vpStdOut, bool &vwbExiting) override;
+    CMIUtilString GetError(void) const override;
+    const CMIUtilString &GetName(void) const override;
+    lldb::SBDebugger &GetTheDebugger(void) override;
+    bool GetDriverIsGDBMICompatibleDriver(void) const override;
+    bool SetId(const CMIUtilString &vId) override;
+    const CMIUtilString &GetId(void) const override;
     // From CMIDriverBase
-    virtual void SetExitApplicationFlag(const bool vbForceExit);
-    virtual bool DoFallThruToAnotherDriver(const CMIUtilString &vCmd, CMIUtilString &vwErrMsg);
-    virtual bool SetDriverToFallThruTo(const CMIDriverBase &vrOtherDriver);
-    virtual FILE *GetStdin(void) const;
-    virtual FILE *GetStdout(void) const;
-    virtual FILE *GetStderr(void) const;
-    virtual const CMIUtilString &GetDriverName(void) const;
-    virtual const CMIUtilString &GetDriverId(void) const;
-    virtual void DeliverSignal(int signal);
+    void SetExitApplicationFlag(const bool vbForceExit) override;
+    bool DoFallThruToAnotherDriver(const CMIUtilString &vCmd, CMIUtilString &vwErrMsg) override;
+    bool SetDriverToFallThruTo(const CMIDriverBase &vrOtherDriver) override;
+    FILE *GetStdin(void) const override;
+    FILE *GetStdout(void) const override;
+    FILE *GetStderr(void) const override;
+    const CMIUtilString &GetDriverName(void) const override;
+    const CMIUtilString &GetDriverId(void) const override;
+    void DeliverSignal(int signal) override;
 
     // Typedefs:
   private:
@@ -142,7 +142,7 @@ class CMIDriver : public CMICmnBase,
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMIDriver(void);
+    /* dtor */ ~CMIDriver(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MIDriverMgr.h b/lldb/tools/lldb-mi/MIDriverMgr.h
index b49aa43bb03..c84ef04c75c 100644
--- a/lldb/tools/lldb-mi/MIDriverMgr.h
+++ b/lldb/tools/lldb-mi/MIDriverMgr.h
@@ -75,8 +75,8 @@ class CMIDriverMgr : public CMICmnBase, public MI::ISingleton<CMIDriverMgr>
     // Methods:
   public:
     // MI system
-    bool Initialize(void);
-    bool Shutdown(void);
+    bool Initialize(void) override;
+    bool Shutdown(void) override;
     //
     CMIUtilString GetAppVersion(void) const;
     bool RegisterDriver(const IDriver &vrADriver, const CMIUtilString &vrDriverID);
@@ -115,7 +115,7 @@ class CMIDriverMgr : public CMICmnBase, public MI::ISingleton<CMIDriverMgr>
     // Overridden:
   private:
     // From CMICmnBase
-    /* dtor */ virtual ~CMIDriverMgr(void);
+    /* dtor */ ~CMIDriverMgr(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MIUtilFileStd.h b/lldb/tools/lldb-mi/MIUtilFileStd.h
index 4b27d2f2fae..5a223489776 100644
--- a/lldb/tools/lldb-mi/MIUtilFileStd.h
+++ b/lldb/tools/lldb-mi/MIUtilFileStd.h
@@ -41,7 +41,7 @@ class CMIUtilFileStd : public CMICmnBase
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMIUtilFileStd(void);
+    /* dtor */ ~CMIUtilFileStd(void) override;
 
     // Attributes:
   private:
diff --git a/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h b/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h
index 1b9c6a102ef..cf113016feb 100644
--- a/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h
+++ b/lldb/tools/lldb-mi/MIUtilMapIdToVariant.h
@@ -42,7 +42,7 @@ class CMIUtilMapIdToVariant : public CMICmnBase
     // Overridden:
   public:
     // From CMICmnBase
-    /* dtor */ virtual ~CMIUtilMapIdToVariant(void);
+    /* dtor */ ~CMIUtilMapIdToVariant(void) override;
 
     // Typdefs:
   private:
diff --git a/lldb/tools/lldb-mi/MIUtilSingletonBase.h b/lldb/tools/lldb-mi/MIUtilSingletonBase.h
index c6d7f55b159..3649a73b9fa 100644
--- a/lldb/tools/lldb-mi/MIUtilSingletonBase.h
+++ b/lldb/tools/lldb-mi/MIUtilSingletonBase.h
@@ -22,8 +22,8 @@ namespace MI
 //   // Overridden:
 //   public:
 //       // From MI::ISingleton
-//       virtual bool Initialize( void );
-//       virtual bool Shutdown( void );
+//       bool Initialize(void) override;
+//       bool Shutdown(void) override;
 //   };
 
 //++ ============================================================================
diff --git a/lldb/tools/lldb-mi/MIUtilVariant.h b/lldb/tools/lldb-mi/MIUtilVariant.h
index 8e7ac7b8573..a6c3ba43903 100644
--- a/lldb/tools/lldb-mi/MIUtilVariant.h
+++ b/lldb/tools/lldb-mi/MIUtilVariant.h
@@ -95,9 +95,9 @@ class CMIUtilVariant
         // Overridden:
       public:
         // From CDataObjectBase
-        virtual ~CDataObject(void);
-        virtual CDataObjectBase *CreateCopyOfSelf(void);
-        virtual bool GetIsDerivedClass(void) const;
+        ~CDataObject(void) override;
+        CDataObjectBase *CreateCopyOfSelf(void) override;
+        bool GetIsDerivedClass(void) const override;
 
         // Overrideable:
       private:
@@ -106,7 +106,7 @@ class CMIUtilVariant
         // Overridden:
       private:
         // From CDataObjectBase
-        virtual void Destroy(void);
+        void Destroy(void) override;
 
         // Attributes:
       private: