Index: lldb/trunk/source/Commands/CommandObjectApropos.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectApropos.h
+++ lldb/trunk/source/Commands/CommandObjectApropos.h
@@ -28,17 +28,14 @@
 
     CommandObjectApropos (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectApropos ();
+    ~CommandObjectApropos() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
-
-
+    bool
+    DoExecute(Args& command,
+	      CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectApropos_h_
+#endif // liblldb_CommandObjectApropos_h_
Index: lldb/trunk/source/Commands/CommandObjectArgs.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectArgs.h
+++ lldb/trunk/source/Commands/CommandObjectArgs.h
@@ -29,17 +29,16 @@
             
             CommandOptions (CommandInterpreter &interpreter);
             
-            virtual
-            ~CommandOptions ();
+            ~CommandOptions() override;
             
-            virtual Error
-            SetOptionValue (uint32_t option_idx, const char *option_arg);
+            Error
+            SetOptionValue(uint32_t option_idx, const char *option_arg) override;
             
             void
-            OptionParsingStarting ();
+            OptionParsingStarting() override;
             
             const OptionDefinition*
-            GetDefinitions ();
+            GetDefinitions() override;
             
             // Options table: Required for subclasses of Options.
             
@@ -48,24 +47,20 @@
         
         CommandObjectArgs (CommandInterpreter &interpreter);
         
-        virtual
-        ~CommandObjectArgs ();
+        ~CommandObjectArgs() override;
         
-        virtual
         Options *
-        GetOptions ();
-        
+        GetOptions() override;
         
     protected:
         
         CommandOptions m_options;
 
-        virtual bool
-        DoExecute (    Args& command,
-                 CommandReturnObject &result);
-        
+        bool
+        DoExecute(Args& command,
+		  CommandReturnObject &result) override;
     };
     
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectArgs_h_
+#endif // liblldb_CommandObjectArgs_h_
Index: lldb/trunk/source/Commands/CommandObjectBreakpoint.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectBreakpoint.h
+++ lldb/trunk/source/Commands/CommandObjectBreakpoint.h
@@ -34,8 +34,7 @@
 public:
     CommandObjectMultiwordBreakpoint (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordBreakpoint ();
+    ~CommandObjectMultiwordBreakpoint() override;
 
     static void
     VerifyBreakpointOrLocationIDs (Args &args, Target *target, CommandReturnObject &result, BreakpointIDList *valid_ids)
@@ -56,4 +55,4 @@
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectBreakpoint_h_
+#endif // liblldb_CommandObjectBreakpoint_h_
Index: lldb/trunk/source/Commands/CommandObjectBreakpointCommand.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectBreakpointCommand.h
+++ lldb/trunk/source/Commands/CommandObjectBreakpointCommand.h
@@ -13,7 +13,6 @@
 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 
@@ -23,7 +22,6 @@
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/CommandObjectMultiword.h"
 
-
 namespace lldb_private {
 
 //-------------------------------------------------------------------------
@@ -35,11 +33,9 @@
 public:
     CommandObjectBreakpointCommand (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectBreakpointCommand ();
-
+    ~CommandObjectBreakpointCommand() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectBreakpointCommand_h_
+#endif // liblldb_CommandObjectBreakpointCommand_h_
Index: lldb/trunk/source/Commands/CommandObjectBugreport.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectBugreport.h
+++ lldb/trunk/source/Commands/CommandObjectBugreport.h
@@ -27,10 +27,9 @@
 public:
     CommandObjectMultiwordBugreport(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordBugreport();
+    ~CommandObjectMultiwordBugreport() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectBugreport_h_
+#endif // liblldb_CommandObjectBugreport_h_
Index: lldb/trunk/source/Commands/CommandObjectCommands.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectCommands.h
+++ lldb/trunk/source/Commands/CommandObjectCommands.h
@@ -30,11 +30,9 @@
 
     CommandObjectMultiwordCommands (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordCommands ();
-
+    ~CommandObjectMultiwordCommands() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectCommands_h_
+#endif // liblldb_CommandObjectCommands_h_
Index: lldb/trunk/source/Commands/CommandObjectDisassemble.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectDisassemble.h
+++ lldb/trunk/source/Commands/CommandObjectDisassemble.h
@@ -33,17 +33,16 @@
 
         CommandOptions (CommandInterpreter &interpreter);
 
-        virtual
-        ~CommandOptions ();
+        ~CommandOptions() override;
 
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg);
+        Error
+        SetOptionValue(uint32_t option_idx, const char *option_arg) override;
 
         void
-        OptionParsingStarting ();
+        OptionParsingStarting() override;
 
         const OptionDefinition*
-        GetDefinitions ();
+        GetDefinitions() override;
 
         const char *
         GetPluginName ()
@@ -61,8 +60,8 @@
             return flavor_string.c_str();
         }
         
-        virtual Error
-        OptionParsingFinished ();
+        Error
+        OptionParsingFinished() override;
 
         bool show_mixed; // Show mixed source/assembly
         bool show_bytes;
@@ -86,25 +85,22 @@
 
     CommandObjectDisassemble (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectDisassemble ();
+    ~CommandObjectDisassemble() override;
 
-    virtual
     Options *
-    GetOptions ()
+    GetOptions() override
     {
         return &m_options;
     }
 
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
+    bool
+    DoExecute(Args& command,
+	      CommandReturnObject &result) override;
 
     CommandOptions m_options;
-
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectDisassemble_h_
+#endif // liblldb_CommandObjectDisassemble_h_
Index: lldb/trunk/source/Commands/CommandObjectExpression.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.h
+++ lldb/trunk/source/Commands/CommandObjectExpression.h
@@ -34,22 +34,21 @@
 
         CommandOptions ();
 
-        virtual
-        ~CommandOptions ();
+        ~CommandOptions() override;
 
-        virtual uint32_t
-        GetNumDefinitions ();
+        uint32_t
+        GetNumDefinitions() override;
         
-        virtual const OptionDefinition*
-        GetDefinitions ();
+        const OptionDefinition*
+        GetDefinitions() override;
         
-        virtual Error
-        SetOptionValue (CommandInterpreter &interpreter,
-                        uint32_t option_idx,
-                        const char *option_value);
+        Error
+        SetOptionValue(CommandInterpreter &interpreter,
+		       uint32_t option_idx,
+		       const char *option_value) override;
         
-        virtual void
-        OptionParsingStarting (CommandInterpreter &interpreter);
+        void
+        OptionParsingStarting(CommandInterpreter &interpreter) override;
 
         // Options table: Required for subclasses of Options.
 
@@ -67,30 +66,28 @@
 
     CommandObjectExpression (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectExpression ();
+    ~CommandObjectExpression() override;
 
-    virtual
     Options *
-    GetOptions ();
+    GetOptions() override;
 
 protected:
     
     //------------------------------------------------------------------
     // IOHandler::Delegate functions
     //------------------------------------------------------------------
-    virtual void
-    IOHandlerInputComplete (IOHandler &io_handler,
-                            std::string &line);
+    void
+    IOHandlerInputComplete(IOHandler &io_handler,
+			   std::string &line) override;
 
     virtual LineStatus
     IOHandlerLinesUpdated (IOHandler &io_handler,
                            StringList &lines,
                            uint32_t line_idx,
                            Error &error);
-    virtual bool
-    DoExecute (const char *command,
-               CommandReturnObject &result);
+    bool
+    DoExecute(const char *command,
+	      CommandReturnObject &result) override;
 
     bool
     EvaluateExpression (const char *expr,
@@ -111,4 +108,4 @@
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectExpression_h_
+#endif // liblldb_CommandObjectExpression_h_
Index: lldb/trunk/source/Commands/CommandObjectFrame.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectFrame.h
+++ lldb/trunk/source/Commands/CommandObjectFrame.h
@@ -30,11 +30,9 @@
 
     CommandObjectMultiwordFrame (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordFrame ();
-
+    ~CommandObjectMultiwordFrame() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectFrame_h_
+#endif // liblldb_CommandObjectFrame_h_
Index: lldb/trunk/source/Commands/CommandObjectGUI.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectGUI.h
+++ lldb/trunk/source/Commands/CommandObjectGUI.h
@@ -28,16 +28,14 @@
 
     CommandObjectGUI (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectGUI ();
+    ~CommandObjectGUI() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& args,
-               CommandReturnObject &result);
-
+    bool
+    DoExecute(Args& args,
+	      CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectGUI_h_
+#endif // liblldb_CommandObjectGUI_h_
Index: lldb/trunk/source/Commands/CommandObjectHelp.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectHelp.h
+++ lldb/trunk/source/Commands/CommandObjectHelp.h
@@ -29,17 +29,16 @@
 
     CommandObjectHelp (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectHelp ();
+    ~CommandObjectHelp() override;
 
-    virtual int
-    HandleCompletion (Args &input,
-                      int &cursor_index,
-                      int &cursor_char_position,
-                      int match_start_point,
-                      int max_return_elements,
-                      bool &word_complete,
-                      StringList &matches);
+    int
+    HandleCompletion(Args &input,
+		     int &cursor_index,
+		     int &cursor_char_position,
+		     int match_start_point,
+		     int max_return_elements,
+		     bool &word_complete,
+		     StringList &matches) override;
     
     class CommandOptions : public Options
     {
@@ -50,11 +49,10 @@
         {
         }
         
-        virtual
-        ~CommandOptions (){}
+        ~CommandOptions() override {}
         
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        Error
+        SetOptionValue(uint32_t option_idx, const char *option_arg) override
         {
             Error error;
             const int short_option = m_getopt_table[option_idx].val;
@@ -79,7 +77,7 @@
         }
         
         void
-        OptionParsingStarting ()
+        OptionParsingStarting() override
         {
             m_show_aliases = true;
             m_show_user_defined = true;
@@ -87,7 +85,7 @@
         }
         
         const OptionDefinition*
-        GetDefinitions ()
+        GetDefinitions() override
         {
             return g_option_table;
         }
@@ -103,22 +101,21 @@
         bool m_show_hidden;
     };
     
-    virtual Options *
-    GetOptions ()
+    Options *
+    GetOptions() override
     {
         return &m_options;
     }
     
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
+    bool
+    DoExecute(Args& command,
+	      CommandReturnObject &result) override;
     
 private:
     CommandOptions m_options;
-    
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectHelp_h_
+#endif // liblldb_CommandObjectHelp_h_
Index: lldb/trunk/source/Commands/CommandObjectLanguage.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectLanguage.h
+++ lldb/trunk/source/Commands/CommandObjectLanguage.h
@@ -13,7 +13,6 @@
 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 
@@ -26,11 +25,10 @@
     public:
         CommandObjectLanguage (CommandInterpreter &interpreter);
         
-        virtual
-        ~CommandObjectLanguage ();
+        ~CommandObjectLanguage() override;
         
-        virtual void
-        GenerateHelpText (Stream &output_stream);
+        void
+        GenerateHelpText(Stream &output_stream) override;
         
     protected:
         bool
@@ -38,4 +36,4 @@
     };
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectLanguage_h_
+#endif // liblldb_CommandObjectLanguage_h_
Index: lldb/trunk/source/Commands/CommandObjectLog.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectLog.h
+++ lldb/trunk/source/Commands/CommandObjectLog.h
@@ -33,8 +33,7 @@
     //------------------------------------------------------------------
     CommandObjectLog(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectLog();
+    ~CommandObjectLog() override;
 
 private:
     //------------------------------------------------------------------
@@ -45,4 +44,4 @@
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectLog_h_
+#endif // liblldb_CommandObjectLog_h_
Index: lldb/trunk/source/Commands/CommandObjectMemory.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.h
+++ lldb/trunk/source/Commands/CommandObjectMemory.h
@@ -23,11 +23,9 @@
 public:
     CommandObjectMemory (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMemory ();
+    ~CommandObjectMemory() override;
 };
 
-
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectMemory_h_
+#endif // liblldb_CommandObjectMemory_h_
Index: lldb/trunk/source/Commands/CommandObjectPlatform.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectPlatform.h
+++ lldb/trunk/source/Commands/CommandObjectPlatform.h
@@ -28,13 +28,12 @@
 public:
     CommandObjectPlatform(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectPlatform();
+    ~CommandObjectPlatform() override;
 
-    private:
+private:
     DISALLOW_COPY_AND_ASSIGN (CommandObjectPlatform);
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectPlatform_h_
+#endif // liblldb_CommandObjectPlatform_h_
Index: lldb/trunk/source/Commands/CommandObjectPlugin.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectPlugin.h
+++ lldb/trunk/source/Commands/CommandObjectPlugin.h
@@ -13,7 +13,6 @@
 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 
@@ -27,10 +26,9 @@
     public:
         CommandObjectPlugin (CommandInterpreter &interpreter);
         
-        virtual
-        ~CommandObjectPlugin ();
+        ~CommandObjectPlugin() override;
     };
     
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectPlugin_h_
+#endif // liblldb_CommandObjectPlugin_h_
Index: lldb/trunk/source/Commands/CommandObjectProcess.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectProcess.h
+++ lldb/trunk/source/Commands/CommandObjectProcess.h
@@ -27,11 +27,9 @@
 public:
     CommandObjectMultiwordProcess (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordProcess ();
-
+    ~CommandObjectMultiwordProcess() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectProcess_h_
+#endif // liblldb_CommandObjectProcess_h_
Index: lldb/trunk/source/Commands/CommandObjectQuit.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectQuit.h
+++ lldb/trunk/source/Commands/CommandObjectQuit.h
@@ -28,19 +28,17 @@
 
     CommandObjectQuit (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectQuit ();
+    ~CommandObjectQuit() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& args,
-             CommandReturnObject &result);
+    bool
+    DoExecute(Args& args,
+	      CommandReturnObject &result) override;
     
     bool
     ShouldAskForConfirmation (bool& is_a_detach);
-
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectQuit_h_
+#endif // liblldb_CommandObjectQuit_h_
Index: lldb/trunk/source/Commands/CommandObjectRegister.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectRegister.h
+++ lldb/trunk/source/Commands/CommandObjectRegister.h
@@ -30,8 +30,7 @@
     //------------------------------------------------------------------
     CommandObjectRegister(CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectRegister();
+    ~CommandObjectRegister() override;
 
 private:
     //------------------------------------------------------------------
@@ -42,4 +41,4 @@
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectRegister_h_
+#endif // liblldb_CommandObjectRegister_h_
Index: lldb/trunk/source/Commands/CommandObjectSettings.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectSettings.h
+++ lldb/trunk/source/Commands/CommandObjectSettings.h
@@ -31,11 +31,9 @@
 
     CommandObjectMultiwordSettings (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordSettings ();
-
+    ~CommandObjectMultiwordSettings() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectSettings_h_
+#endif // liblldb_CommandObjectSettings_h_
Index: lldb/trunk/source/Commands/CommandObjectSource.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectSource.h
+++ lldb/trunk/source/Commands/CommandObjectSource.h
@@ -30,11 +30,9 @@
 
     CommandObjectMultiwordSource (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordSource ();
-
+    ~CommandObjectMultiwordSource() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectSource.h_h_
+#endif // liblldb_CommandObjectSource_h_
Index: lldb/trunk/source/Commands/CommandObjectSyntax.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectSyntax.h
+++ lldb/trunk/source/Commands/CommandObjectSyntax.h
@@ -28,17 +28,14 @@
 
     CommandObjectSyntax (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectSyntax ();
+    ~CommandObjectSyntax() override;
     
 protected:
-    virtual bool
-    DoExecute (Args& command,
-             CommandReturnObject &result);
-
-
+    bool
+    DoExecute(Args& command,
+	      CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectSyntax_h_
+#endif // liblldb_CommandObjectSyntax_h_
Index: lldb/trunk/source/Commands/CommandObjectTarget.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.h
+++ lldb/trunk/source/Commands/CommandObjectTarget.h
@@ -30,12 +30,9 @@
 
     CommandObjectMultiwordTarget (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordTarget ();
-
-
+    ~CommandObjectMultiwordTarget() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectTarget_h_
+#endif // liblldb_CommandObjectTarget_h_
Index: lldb/trunk/source/Commands/CommandObjectThread.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectThread.h
+++ lldb/trunk/source/Commands/CommandObjectThread.h
@@ -24,11 +24,9 @@
 
     CommandObjectMultiwordThread (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordThread ();
-
+    ~CommandObjectMultiwordThread() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectThread_h_
+#endif // liblldb_CommandObjectThread_h_
Index: lldb/trunk/source/Commands/CommandObjectType.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectType.h
+++ lldb/trunk/source/Commands/CommandObjectType.h
@@ -13,7 +13,6 @@
 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 
@@ -28,10 +27,9 @@
 public:
     CommandObjectType (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectType ();
+    ~CommandObjectType() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectType_h_
+#endif // liblldb_CommandObjectType_h_
Index: lldb/trunk/source/Commands/CommandObjectVersion.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectVersion.h
+++ lldb/trunk/source/Commands/CommandObjectVersion.h
@@ -28,16 +28,14 @@
 
     CommandObjectVersion (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectVersion ();
+    ~CommandObjectVersion() override;
 
 protected:
-    virtual bool
-    DoExecute (Args& args,
-               CommandReturnObject &result);
-
+    bool
+    DoExecute(Args& args,
+	      CommandReturnObject &result) override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectVersion_h_
+#endif // liblldb_CommandObjectVersion_h_
Index: lldb/trunk/source/Commands/CommandObjectWatchpoint.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectWatchpoint.h
+++ lldb/trunk/source/Commands/CommandObjectWatchpoint.h
@@ -30,14 +30,12 @@
 public:
     CommandObjectMultiwordWatchpoint (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectMultiwordWatchpoint ();
+    ~CommandObjectMultiwordWatchpoint() override;
 
     static bool
     VerifyWatchpointIDs(Target *target, Args &args, std::vector<uint32_t> &wp_ids);
-
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectWatchpoint_h_
+#endif // liblldb_CommandObjectWatchpoint_h_
Index: lldb/trunk/source/Commands/CommandObjectWatchpointCommand.h
===================================================================
--- lldb/trunk/source/Commands/CommandObjectWatchpointCommand.h
+++ lldb/trunk/source/Commands/CommandObjectWatchpointCommand.h
@@ -13,7 +13,6 @@
 // C Includes
 // C++ Includes
 
-
 // Other libraries and framework includes
 // Project includes
 
@@ -33,11 +32,9 @@
 public:
     CommandObjectWatchpointCommand (CommandInterpreter &interpreter);
 
-    virtual
-    ~CommandObjectWatchpointCommand ();
-
+    ~CommandObjectWatchpointCommand() override;
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_CommandObjectWatchpointCommand_h_
+#endif // liblldb_CommandObjectWatchpointCommand_h_