Fix Clang-tidy misc-use-override warnings in include/lldb/API, Breakpoint and Symbol, unify closing inclusion guards

patch by Eugene Zelenko.

llvm-svn: 246624

24 files changed, 141 insertions, 197 deletions

diff --git a/lldb/include/lldb/API/SystemInitializerFull.h b/lldb/include/lldb/API/SystemInitializerFull.h
index 0b4e8795ffd..9e37611a659 100644
--- a/lldb/include/lldb/API/SystemInitializerFull.h
+++ b/lldb/include/lldb/API/SystemInitializerFull.h
@@ -26,7 +26,7 @@ class SystemInitializerFull : public SystemInitializerCommon
 {
   public:
     SystemInitializerFull();
-    virtual ~SystemInitializerFull();
+    ~SystemInitializerFull() override;
 
     void Initialize() override;
     void Terminate() override;
@@ -34,6 +34,7 @@ class SystemInitializerFull : public SystemInitializerCommon
   private:
     void InitializeSWIG();
 };
-}
 
-#endif
+} // namespace lldb_private
+
+#endif // LLDB_API_SYSTEM_INITIALIZER_FULL_H
diff --git a/lldb/include/lldb/Breakpoint/Breakpoint.h b/lldb/include/lldb/Breakpoint/Breakpoint.h
index a70c2787a1e..a1d1c162ab4 100644
--- a/lldb/include/lldb/Breakpoint/Breakpoint.h
+++ b/lldb/include/lldb/Breakpoint/Breakpoint.h
@@ -85,7 +85,6 @@ public:
     static const ConstString &
     GetEventIdentifier ();
 
-
     //------------------------------------------------------------------
     /// An enum specifying the match style for breakpoint settings.  At
     /// present only used for function name style breakpoints.
@@ -101,18 +100,16 @@ public:
         public EventData
     {
     public:
+        BreakpointEventData (lldb::BreakpointEventType sub_type,
+                             const lldb::BreakpointSP &new_breakpoint_sp);
+
+        ~BreakpointEventData() override;
 
         static const ConstString &
         GetFlavorString ();
 
-        virtual const ConstString &
-        GetFlavor () const;
-
-        BreakpointEventData (lldb::BreakpointEventType sub_type,
-                             const lldb::BreakpointSP &new_breakpoint_sp);
-
-        virtual
-        ~BreakpointEventData();
+        const ConstString &
+        GetFlavor() const override;
 
         lldb::BreakpointEventType
         GetBreakpointEventType () const;
@@ -126,9 +123,8 @@ public:
             return m_locations;
         }
 
-
-        virtual void
-        Dump (Stream *s) const;
+        void
+        Dump(Stream *s) const override;
 
         static lldb::BreakpointEventType
         GetBreakpointEventTypeFromEvent (const lldb::EventSP &event_sp);
@@ -154,7 +150,6 @@ public:
         DISALLOW_COPY_AND_ASSIGN (BreakpointEventData);
     };
 
-
     class BreakpointPrecondition
     {
     public:
@@ -179,7 +174,7 @@ public:
     /// breakpoints.  The varieties of breakpoints are specified instead by
     /// providing different resolvers & filters.
     //------------------------------------------------------------------
-    ~Breakpoint();
+    ~Breakpoint() override;
 
     //------------------------------------------------------------------
     // Methods
@@ -197,14 +192,13 @@ public:
     /// Standard "Dump" method.  At present it does nothing.
     //------------------------------------------------------------------
     void
-    Dump (Stream *s);
+    Dump(Stream *s) override;
 
     //------------------------------------------------------------------
     // The next set of methods provide ways to tell the breakpoint to update
     // it's location list - usually done when modules appear or disappear.
     //------------------------------------------------------------------
 
-
     //------------------------------------------------------------------
     /// Tell this breakpoint to clear all its breakpoint sites.  Done
     /// when the process holding the breakpoint sites is destroyed.
@@ -262,7 +256,6 @@ public:
                     bool load_event,
                     bool delete_locations = false);
 
-
     //------------------------------------------------------------------
     /// Tells the breakpoint the old module \a old_module_sp has been
     /// replaced by new_module_sp (usually because the underlying file has been
@@ -373,7 +366,7 @@ public:
     /// If \a enable is \b true, enable the breakpoint, if \b false disable it.
     //------------------------------------------------------------------
     void
-    SetEnabled (bool enable);
+    SetEnabled(bool enable) override;
 
     //------------------------------------------------------------------
     /// Check the Enable/Disable state.
@@ -381,7 +374,7 @@ public:
     ///     \b true if the breakpoint is enabled, \b false if disabled.
     //------------------------------------------------------------------
     bool
-    IsEnabled ();
+    IsEnabled() override;
 
     //------------------------------------------------------------------
     /// Set the breakpoint to ignore the next \a count breakpoint hits.
@@ -407,7 +400,6 @@ public:
     uint32_t
     GetHitCount () const;
 
-
     //------------------------------------------------------------------
     /// If \a one_shot is \b true, breakpoint will be deleted on first hit.
     //------------------------------------------------------------------
@@ -619,7 +611,6 @@ public:
     BreakpointOptions *
     GetOptions ();
 
-
     //------------------------------------------------------------------
     /// Invoke the callback action when the breakpoint is hit.
     ///
@@ -713,7 +704,6 @@ protected:
     // Protected Methods
     //------------------------------------------------------------------
 
-
     //------------------------------------------------------------------
     /// Constructors and Destructors
     /// Only the Target can make a breakpoint, and it owns the breakpoint lifespans.
@@ -807,4 +797,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_Breakpoint_h_
+#endif // liblldb_Breakpoint_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointLocation.h b/lldb/include/lldb/Breakpoint/BreakpointLocation.h
index c3e620d085c..b2b8ebdc55e 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointLocation.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointLocation.h
@@ -49,7 +49,7 @@ class BreakpointLocation :
     public StoppointLocation
 {
 public:
-    ~BreakpointLocation ();
+    ~BreakpointLocation() override;
 
     //------------------------------------------------------------------
     /// Gets the load address for this breakpoint location
@@ -58,7 +58,7 @@ public:
     ///     LLDB_INVALID_ADDRESS if not yet set.
     //------------------------------------------------------------------
     lldb::addr_t
-    GetLoadAddress () const;
+    GetLoadAddress() const override;
 
     //------------------------------------------------------------------
     /// Gets the Address for this breakpoint location
@@ -88,7 +88,7 @@ public:
     ///     \b false otherwise.
     //------------------------------------------------------------------
     bool
-    ShouldStop (StoppointCallbackContext *context);
+    ShouldStop(StoppointCallbackContext *context) override;
 
     //------------------------------------------------------------------
     // The next section deals with various breakpoint options.
@@ -178,7 +178,6 @@ public:
     bool
     ConditionSaysStop (ExecutionContext &exe_ctx, Error &error);
 
-
     //------------------------------------------------------------------
     /// Set the valid thread to be checked when the breakpoint is hit.
     ///
@@ -270,7 +269,7 @@ public:
     /// Standard "Dump" method.  At present it does nothing.
     //------------------------------------------------------------------
     void
-    Dump (Stream *s) const;
+    Dump(Stream *s) const override;
 
     //------------------------------------------------------------------
     /// Use this to set location specific breakpoint options.
@@ -299,7 +298,6 @@ public:
     bool
     ValidForThisThread (Thread *thread);
 
-    
     //------------------------------------------------------------------
     /// Invoke the callback action when the breakpoint is hit.
     ///
@@ -418,7 +416,6 @@ private:
     void
     UndoBumpHitCount();
 
-
     //------------------------------------------------------------------
     // Constructors and Destructors
     //
@@ -479,4 +476,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointLocation_h_
+#endif // liblldb_BreakpointLocation_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointOptions.h b/lldb/include/lldb/Breakpoint/BreakpointOptions.h
index bf10fc096d7..7ceeb1866da 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointOptions.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointOptions.h
@@ -115,7 +115,6 @@ public:
     //------------------------------------------------------------------
     void SetCallback (BreakpointHitCallback callback, const lldb::BatonSP &baton_sp, bool synchronous = false);
     
-    
     //------------------------------------------------------------------
     /// Remove the callback from this option set.
     //------------------------------------------------------------------
@@ -298,7 +297,6 @@ public:
                   lldb::user_id_t break_id,
                   lldb::user_id_t break_loc_id);
     
-    
     struct CommandData
     {
         CommandData () :
@@ -325,16 +323,14 @@ public:
         {
         }
 
-        virtual
-        ~CommandBaton ()
+        ~CommandBaton() override
         {
             delete ((CommandData *)m_data);
             m_data = NULL;
         }
         
-        virtual void
-        GetDescription (Stream *s, lldb::DescriptionLevel level) const;
-
+        void
+        GetDescription (Stream *s, lldb::DescriptionLevel level) const override;
     };
 
 protected:
@@ -359,4 +355,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointOptions_h_
+#endif // liblldb_BreakpointOptions_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolver.h b/lldb/include/lldb/Breakpoint/BreakpointResolver.h
index 6ba53ea92f3..198abed841b 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolver.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolver.h
@@ -66,8 +66,7 @@ public:
     /// The Destructor is virtual, all significant breakpoint resolvers derive
     /// from this class.
     //------------------------------------------------------------------
-    virtual
-    ~BreakpointResolver ();
+    ~BreakpointResolver() override;
 
     //------------------------------------------------------------------
     /// This sets the breakpoint for this resolver.
@@ -105,8 +104,8 @@ public:
     /// @param[in] s
     ///   Stream to which the output is copied.
     //------------------------------------------------------------------
-    virtual void
-    GetDescription (Stream *s) = 0;
+    void
+    GetDescription(Stream *s) override = 0;
 
     //------------------------------------------------------------------
     /// Standard "Dump" method.  At present it does nothing.
@@ -157,4 +156,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointResolver_h_
+#endif // liblldb_BreakpointResolver_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h b/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h
index c8f034d7345..4cd84f1cc7d 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h
@@ -31,8 +31,7 @@ public:
     BreakpointResolverAddress (Breakpoint *bkpt,
                        const Address &addr);
 
-    virtual
-    ~BreakpointResolverAddress ();
+    ~BreakpointResolverAddress() override;
 
     void
     ResolveBreakpoint (SearchFilter &filter) override;
@@ -74,4 +73,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointResolverAddress_h_
+#endif // liblldb_BreakpointResolverAddress_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h b/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h
index 2403d24515a..2dde1546f12 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h
@@ -35,8 +35,7 @@ public:
                                 bool skip_prologue,
                                 bool exact_match);
 
-    virtual
-    ~BreakpointResolverFileLine ();
+    ~BreakpointResolverFileLine() override;
 
     Searcher::CallbackReturn
     SearchCallback (SearchFilter &filter,
@@ -76,4 +75,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointResolverFileLine_h_
+#endif // liblldb_BreakpointResolverFileLine_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h b/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h
index 8e18fff1644..a8d7a50b5d9 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h
@@ -32,8 +32,7 @@ public:
                                  RegularExpression &regex,
                                  bool exact_match);
 
-    virtual
-    ~BreakpointResolverFileRegex ();
+    ~BreakpointResolverFileRegex() override;
 
     Searcher::CallbackReturn
     SearchCallback (SearchFilter &filter,
@@ -70,4 +69,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointResolverFileRegex_h_
+#endif // liblldb_BreakpointResolverFileRegex_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverName.h b/lldb/include/lldb/Breakpoint/BreakpointResolverName.h
index f6fed41f0ef..4d9c4b1ec98 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolverName.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolverName.h
@@ -14,6 +14,7 @@
 // C++ Includes
 #include <vector>
 #include <string>
+
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Breakpoint/BreakpointResolver.h"
@@ -64,8 +65,7 @@ public:
                             Breakpoint::MatchType type,
                             bool skip_prologue);
 
-    virtual
-    ~BreakpointResolverName ();
+    ~BreakpointResolverName() override;
 
     Searcher::CallbackReturn
     SearchCallback (SearchFilter &filter,
@@ -126,4 +126,4 @@ protected:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointResolverName_h_
+#endif // liblldb_BreakpointResolverName_h_
diff --git a/lldb/include/lldb/Breakpoint/BreakpointSite.h b/lldb/include/lldb/Breakpoint/BreakpointSite.h
index 59bc54d973c..6cebcab8e2d 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointSite.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointSite.h
@@ -55,7 +55,7 @@ public:
                     // display any breakpoint opcodes.
     };
 
-    virtual ~BreakpointSite ();
+    ~BreakpointSite() override;
 
     //----------------------------------------------------------------------
     // This section manages the breakpoint traps
@@ -139,8 +139,8 @@ public:
     /// @return
     ///    \b true if we should stop, \b false otherwise.
     //------------------------------------------------------------------
-    virtual bool
-    ShouldStop (StoppointCallbackContext *context);
+    bool
+    ShouldStop(StoppointCallbackContext *context) override;
 
     //------------------------------------------------------------------
     /// Standard Dump method
@@ -149,7 +149,7 @@ public:
     ///    The stream to dump this output.
     //------------------------------------------------------------------
     void
-    Dump (Stream *s) const;
+    Dump(Stream *s) const override;
 
     //------------------------------------------------------------------
     /// The "Owners" are the breakpoint locations that share this
@@ -215,7 +215,6 @@ public:
     bool 
     ValidForThisThread (Thread *thread);
 
-
     //------------------------------------------------------------------
     /// Print a description of this breakpoint site to the stream \a s.
     /// GetDescription tells you about the breakpoint site's owners.
@@ -315,4 +314,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointSite_h_
+#endif // liblldb_BreakpointSite_h_
diff --git a/lldb/include/lldb/Breakpoint/Watchpoint.h b/lldb/include/lldb/Breakpoint/Watchpoint.h
index ee4d5688e80..14c2ae75b71 100644
--- a/lldb/include/lldb/Breakpoint/Watchpoint.h
+++ b/lldb/include/lldb/Breakpoint/Watchpoint.h
@@ -38,18 +38,16 @@ public:
         public EventData
     {
     public:
+        WatchpointEventData (lldb::WatchpointEventType sub_type,
+                             const lldb::WatchpointSP &new_watchpoint_sp);
+
+        ~WatchpointEventData() override;
 
         static const ConstString &
         GetFlavorString ();
 
-        virtual const ConstString &
-        GetFlavor () const;
-
-        WatchpointEventData (lldb::WatchpointEventType sub_type,
-                             const lldb::WatchpointSP &new_watchpoint_sp);
-
-        virtual
-        ~WatchpointEventData();
+        const ConstString &
+        GetFlavor() const override;
 
         lldb::WatchpointEventType
         GetWatchpointEventType () const;
@@ -57,8 +55,8 @@ public:
         lldb::WatchpointSP &
         GetWatchpoint ();
         
-        virtual void
-        Dump (Stream *s) const;
+        void
+        Dump(Stream *s) const override;
 
         static lldb::WatchpointEventType
         GetWatchpointEventTypeFromEvent (const lldb::EventSP &event_sp);
@@ -78,7 +76,7 @@ public:
     };
 
     Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const CompilerType *type, bool hardware = true);
-    ~Watchpoint ();
+    ~Watchpoint() override;
 
     void
     IncrementFalseAlarmsAndReviseHitCount();
@@ -89,11 +87,11 @@ public:
     void
     SetEnabled (bool enabled, bool notify = true);
 
-    virtual bool
-    IsHardware () const;
+    bool
+    IsHardware() const override;
 
-    virtual bool
-    ShouldStop (StoppointCallbackContext *context);
+    bool
+    ShouldStop(StoppointCallbackContext *context) override;
 
     bool        WatchpointRead () const;
     bool        WatchpointWrite () const;
@@ -110,7 +108,7 @@ public:
     bool        CaptureWatchedValue (const ExecutionContext &exe_ctx);
 
     void        GetDescription (Stream *s, lldb::DescriptionLevel level);
-    void        Dump (Stream *s) const;
+    void        Dump (Stream *s) const override;
     void        DumpSnapshots (Stream *s, const char * prefix = NULL) const;
     void        DumpWithLevel (Stream *s, lldb::DescriptionLevel description_level) const;
     Target      &GetTarget() { return m_target; }
@@ -201,7 +199,6 @@ public:
         return m_type;
     }
 
-
 private:
     friend class Target;
     friend class WatchpointList;
@@ -261,4 +258,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_Watchpoint_h_
+#endif // liblldb_Watchpoint_h_
diff --git a/lldb/include/lldb/Breakpoint/WatchpointOptions.h b/lldb/include/lldb/Breakpoint/WatchpointOptions.h
index 64c65f92b44..809e7fca182 100644
--- a/lldb/include/lldb/Breakpoint/WatchpointOptions.h
+++ b/lldb/include/lldb/Breakpoint/WatchpointOptions.h
@@ -99,7 +99,6 @@ public:
     //------------------------------------------------------------------
     void SetCallback (WatchpointHitCallback callback, const lldb::BatonSP &baton_sp, bool synchronous = false);
     
-    
     //------------------------------------------------------------------
     /// Remove the callback from this option set.
     //------------------------------------------------------------------
@@ -196,7 +195,6 @@ public:
                   StoppointCallbackContext *context, 
                   lldb::user_id_t watch_id);
     
-    
     struct CommandData
     {
         CommandData () :
@@ -223,16 +221,14 @@ public:
         {
         }
 
-        virtual
-        ~CommandBaton ()
+        ~CommandBaton() override
         {
             delete ((CommandData *)m_data);
             m_data = NULL;
         }
         
-        virtual void
-        GetDescription (Stream *s, lldb::DescriptionLevel level) const;
-
+        void
+        GetDescription(Stream *s, lldb::DescriptionLevel level) const override;
     };
 
 protected:
@@ -252,4 +248,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_WatchpointOptions_h_
+#endif // liblldb_WatchpointOptions_h_
diff --git a/lldb/include/lldb/Symbol/Block.h b/lldb/include/lldb/Symbol/Block.h
index 873d630a51b..47695007dc0 100644
--- a/lldb/include/lldb/Symbol/Block.h
+++ b/lldb/include/lldb/Symbol/Block.h
@@ -76,7 +76,7 @@ public:
     //------------------------------------------------------------------
     /// Destructor.
     //------------------------------------------------------------------
-    virtual ~Block ();
+    ~Block() override;
 
     //------------------------------------------------------------------
     /// Add a child to this object.
@@ -110,20 +110,20 @@ public:
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    CalculateSymbolContext(SymbolContext* sc);
+    void
+    CalculateSymbolContext(SymbolContext* sc) override;
 
-    virtual lldb::ModuleSP
-    CalculateSymbolContextModule ();
+    lldb::ModuleSP
+    CalculateSymbolContextModule() override;
 
-    virtual CompileUnit *
-    CalculateSymbolContextCompileUnit ();
+    CompileUnit *
+    CalculateSymbolContextCompileUnit() override;
 
-    virtual Function *
-    CalculateSymbolContextFunction ();
+    Function *
+    CalculateSymbolContextFunction() override;
 
-    virtual Block *
-    CalculateSymbolContextBlock ();
+    Block *
+    CalculateSymbolContextBlock() override;
 
     //------------------------------------------------------------------
     /// Check if an offset is in one of the block offset ranges.
@@ -192,8 +192,8 @@ public:
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    DumpSymbolContext(Stream *s);
+    void
+    DumpSymbolContext(Stream *s) override;
 
     void
     DumpAddressRanges (Stream *s,
@@ -215,7 +215,6 @@ public:
     Block *
     GetParent () const;
     
-    
     //------------------------------------------------------------------
     /// Get the inlined block that contains this block.
     ///
@@ -278,7 +277,6 @@ public:
     lldb::VariableListSP
     GetBlockVariableList (bool can_create);
 
-
     //------------------------------------------------------------------
     /// Get the variable list for this block and optionally all child
     /// blocks if \a get_child_variables is \b true.
@@ -399,7 +397,6 @@ public:
                             const Declaration *decl_ptr,
                             const Declaration *call_decl_ptr);
 
-
     void
     SetParentScope (SymbolContextScope *parent_scope)
     {
@@ -422,8 +419,6 @@ public:
         m_variable_list_sp = variable_list_sp;
     }
 
-
-
     bool
     BlockInfoHasBeenParsed() const
     {
@@ -491,7 +486,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN (Block);
 };
 
-
 } // namespace lldb_private
 
-#endif  // liblldb_Block_h_
+#endif // liblldb_Block_h_
diff --git a/lldb/include/lldb/Symbol/ClangASTContext.h b/lldb/include/lldb/Symbol/ClangASTContext.h
index 46df0b769b7..fba0ef0683a 100644
--- a/lldb/include/lldb/Symbol/ClangASTContext.h
+++ b/lldb/include/lldb/Symbol/ClangASTContext.h
@@ -24,7 +24,6 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/TemplateBase.h"
 
-
 // Project includes
 #include "lldb/lldb-enumerations.h"
 #include "lldb/Core/ClangForward.h"
@@ -47,7 +46,7 @@ public:
     //------------------------------------------------------------------
     ClangASTContext (const char *triple = NULL);
 
-    ~ClangASTContext();
+    ~ClangASTContext() override;
     
     static ClangASTContext*
     GetASTContext (clang::ASTContext* ast_ctx);
@@ -353,7 +352,6 @@ public:
     static bool
     RecordHasFields (const clang::RecordDecl *record_decl);
 
-
     CompilerType
     CreateObjCClass (const char *name, 
                      clang::DeclContext *decl_ctx, 
@@ -370,8 +368,6 @@ public:
                                      int *assigned_accessibilities,
                                      size_t num_assigned_accessibilities);
 
-    
-
     // Returns a mask containing bits from the ClangASTContext::eTypeXXX enumerations
 
 
@@ -672,7 +668,6 @@ public:
     static bool
     GetObjCClassName (const CompilerType& type, std::string &class_name);
     
-    
     //----------------------------------------------------------------------
     // Type Completion
     //----------------------------------------------------------------------
@@ -879,7 +874,6 @@ public:
                          size_t idx,
                          lldb::TemplateArgumentKind &kind) override;
     
-    
     //----------------------------------------------------------------------
     // Modifying RecordType
     //----------------------------------------------------------------------
@@ -930,7 +924,6 @@ public:
                                 clang::CXXBaseSpecifier const * const *base_classes,
                                 unsigned num_base_classes);
     
-    
     static bool
     SetObjCSuperClass (const CompilerType& type,
                        const CompilerType &superclass_clang_type);
@@ -981,7 +974,6 @@ public:
     CompilerType
     GetEnumerationIntegerType (void *type);
     
-    
     //------------------------------------------------------------------
     // Pointers & References
     //------------------------------------------------------------------
@@ -1045,7 +1037,6 @@ public:
     static clang::EnumDecl *
     GetAsEnumDecl (const CompilerType& type);
     
-    
     static clang::RecordDecl *
     GetAsRecordDecl (const CompilerType& type);
     
@@ -1062,6 +1053,7 @@ public:
             return clang::QualType::getFromOpaquePtr(type.GetOpaqueQualType());
         return clang::QualType();
     }
+
     static clang::QualType
     GetCanonicalQualType (const CompilerType& type)
     {
@@ -1127,4 +1119,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_ClangASTContext_h_
+#endif // liblldb_ClangASTContext_h_
diff --git a/lldb/include/lldb/Symbol/ClangASTImporter.h b/lldb/include/lldb/Symbol/ClangASTImporter.h
index 96164f29a44..de1749c3772 100644
--- a/lldb/include/lldb/Symbol/ClangASTImporter.h
+++ b/lldb/include/lldb/Symbol/ClangASTImporter.h
@@ -276,9 +276,9 @@ private:
         
         void ImportDefinitionTo (clang::Decl *to, clang::Decl *from);
         
-        clang::Decl *Imported (clang::Decl *from, clang::Decl *to);
+        clang::Decl *Imported(clang::Decl *from, clang::Decl *to) override;
         
-        clang::Decl *GetOriginalDecl (clang::Decl *To);
+        clang::Decl *GetOriginalDecl(clang::Decl *To) override;
         
         std::set<clang::NamedDecl *>   *m_decls_to_deport;
         std::set<clang::NamedDecl *>   *m_decls_already_deported;
@@ -368,6 +368,6 @@ private:
     clang::FileManager      m_file_manager;
 };
     
-}
+} // namespace lldb_private
 
-#endif
+#endif // liblldb_ClangASTImporter_h_
diff --git a/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h b/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h
index 17650f7f14f..21684baaf5a 100644
--- a/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h
+++ b/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h
@@ -126,6 +126,7 @@ public:
         return lldb::eLanguageTypeUnknown;
             
     }
+
     const char *
     GetObjectPtrName() const
     {
@@ -167,7 +168,7 @@ class ClangExternalASTSourceCommon : public clang::ExternalASTSource
 {
 public:
     ClangExternalASTSourceCommon();
-    ~ClangExternalASTSourceCommon();
+    ~ClangExternalASTSourceCommon() override;
 
     ClangASTMetadata *GetMetadata(const void *object);
     void SetMetadata(const void *object, ClangASTMetadata &metadata);
@@ -181,6 +182,6 @@ private:
     MetadataMap m_metadata;
 };
 
-}
+} // namespace lldb_private
 
-#endif
+#endif // liblldb_ClangExternalASTSourceCommon_h
diff --git a/lldb/include/lldb/Symbol/CompileUnit.h b/lldb/include/lldb/Symbol/CompileUnit.h
index 85f446ddd00..d4b343a4de1 100644
--- a/lldb/include/lldb/Symbol/CompileUnit.h
+++ b/lldb/include/lldb/Symbol/CompileUnit.h
@@ -111,8 +111,7 @@ public:
     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    virtual
-    ~CompileUnit();
+    ~CompileUnit() override;
 
     //------------------------------------------------------------------
     /// Add a function to this compile unit.
@@ -131,22 +130,22 @@ public:
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    CalculateSymbolContext(SymbolContext* sc);
+    void
+    CalculateSymbolContext(SymbolContext* sc) override;
 
-    virtual lldb::ModuleSP
-    CalculateSymbolContextModule ();
+    lldb::ModuleSP
+    CalculateSymbolContextModule() override;
     
-    virtual CompileUnit *
-    CalculateSymbolContextCompileUnit ();
+    CompileUnit *
+    CalculateSymbolContextCompileUnit() override;
 
     //------------------------------------------------------------------
     /// @copydoc SymbolContextScope::DumpSymbolContext(Stream*)
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    DumpSymbolContext(Stream *s);
+    void
+    DumpSymbolContext(Stream *s) override;
 
     lldb::LanguageType
     GetLanguage();
@@ -457,4 +456,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_CompUnit_h_
+#endif // liblldb_CompUnit_h_
diff --git a/lldb/include/lldb/Symbol/Function.h b/lldb/include/lldb/Symbol/Function.h
index 01a2af182d3..be8e173c252 100644
--- a/lldb/include/lldb/Symbol/Function.h
+++ b/lldb/include/lldb/Symbol/Function.h
@@ -147,7 +147,6 @@ protected:
     Declaration m_declaration; ///< Information describing where this function information was defined.
 };
 
-
 //----------------------------------------------------------------------
 /// @class InlineFunctionInfo Function.h "lldb/Symbol/Function.h"
 /// @brief A class that describes information for an inlined function.
@@ -203,7 +202,7 @@ public:
     //------------------------------------------------------------------
     /// Destructor.
     //------------------------------------------------------------------
-    ~InlineFunctionInfo();
+    ~InlineFunctionInfo() override;
 
     //------------------------------------------------------------------
     /// Compare two inlined function information objects.
@@ -294,8 +293,8 @@ public:
     ///
     /// @see ConstString::StaticMemorySize ()
     //------------------------------------------------------------------
-    virtual size_t
-    MemorySize() const;
+    size_t
+    MemorySize() const override;
 
 private:
     //------------------------------------------------------------------
@@ -415,24 +414,24 @@ public:
     //------------------------------------------------------------------
     /// Destructor.
     //------------------------------------------------------------------
-    ~Function ();
+    ~Function() override;
 
     //------------------------------------------------------------------
     /// @copydoc SymbolContextScope::CalculateSymbolContext(SymbolContext*)
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    CalculateSymbolContext(SymbolContext* sc);
+    void
+    CalculateSymbolContext(SymbolContext* sc) override;
 
-    virtual lldb::ModuleSP
-    CalculateSymbolContextModule ();
+    lldb::ModuleSP
+    CalculateSymbolContextModule() override;
     
-    virtual CompileUnit *
-    CalculateSymbolContextCompileUnit ();
+    CompileUnit *
+    CalculateSymbolContextCompileUnit() override;
     
-    virtual Function *
-    CalculateSymbolContextFunction ();
+    Function *
+    CalculateSymbolContextFunction() override;
 
     const AddressRange &
     GetAddressRange()
@@ -600,8 +599,8 @@ public:
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    DumpSymbolContext(Stream *s);
+    void
+    DumpSymbolContext(Stream *s) override;
 
     //------------------------------------------------------------------
     /// Get the memory cost of this object.
@@ -652,8 +651,6 @@ protected:
         flagsCalculatedPrologueSize = (1 << 0)  ///< Have we already tried to calculate the prologue size?
     };
 
-
-
     //------------------------------------------------------------------
     // Member variables.
     //------------------------------------------------------------------
@@ -672,4 +669,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_Function_h_
+#endif // liblldb_Function_h_
diff --git a/lldb/include/lldb/Symbol/LineTable.h b/lldb/include/lldb/Symbol/LineTable.h
index 3e25ad17e94..7cc41b17d52 100644
--- a/lldb/include/lldb/Symbol/LineTable.h
+++ b/lldb/include/lldb/Symbol/LineTable.h
@@ -343,7 +343,6 @@ protected:
             return 0;
         }
 
-
         class LessThanBinaryPredicate
         {
         public:
@@ -400,12 +399,11 @@ protected:
             LineSequence()
         {}
 
-        virtual
-        ~LineSequenceImpl()
+        ~LineSequenceImpl() override
         {}
 
-        virtual void
-        Clear();
+        void
+        Clear() override;
 
         entry_collection m_entries; ///< The collection of line entries in this sequence.
     };
@@ -419,4 +417,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_LineTable_h_
+#endif // liblldb_LineTable_h_
diff --git a/lldb/include/lldb/Symbol/ObjectContainer.h b/lldb/include/lldb/Symbol/ObjectContainer.h
index 679e8f03b67..baacc136eaf 100644
--- a/lldb/include/lldb/Symbol/ObjectContainer.h
+++ b/lldb/include/lldb/Symbol/ObjectContainer.h
@@ -71,8 +71,7 @@ public:
     /// The destructor is virtual since this class is designed to be
     /// inherited from by the plug-in instance.
     //------------------------------------------------------------------
-    virtual
-    ~ObjectContainer()
+    ~ObjectContainer() override
     {
     }
 
@@ -233,4 +232,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_ObjectContainer_h_
+#endif // liblldb_ObjectContainer_h_
diff --git a/lldb/include/lldb/Symbol/ObjectFile.h b/lldb/include/lldb/Symbol/ObjectFile.h
index ff00ac26e67..93d8c27a907 100644
--- a/lldb/include/lldb/Symbol/ObjectFile.h
+++ b/lldb/include/lldb/Symbol/ObjectFile.h
@@ -125,8 +125,7 @@ public:
     /// The destructor is virtual since this class is designed to be
     /// inherited from by the plug-in instance.
     //------------------------------------------------------------------
-    virtual
-    ~ObjectFile();
+    ~ObjectFile() override;
     
     //------------------------------------------------------------------
     /// Dump a description of this object to a Stream.
@@ -374,7 +373,6 @@ public:
     virtual void
     CreateSections (SectionList &unified_section_list) = 0;
 
-
     //------------------------------------------------------------------
     /// Notify the ObjectFile that the file addresses in the Sections
     /// for this module have been changed.
@@ -595,7 +593,6 @@ public:
     virtual lldb_private::Address
     GetHeaderAddress () { return Address(m_memory_addr);}
 
-    
     virtual uint32_t
     GetNumThreadContexts ()
     {
@@ -767,7 +764,6 @@ public:
         return 0;
     }
 
-
     //------------------------------------------------------------------
     /// Return true if this file is a dynamic link editor (dyld)
     ///
@@ -823,6 +819,7 @@ public:
                      lldb::offset_t section_offset, 
                      void *dst, 
                      size_t dst_len) const;
+
     virtual size_t
     ReadSectionData (const Section *section, 
                      DataExtractor& section_data) const;
@@ -880,5 +877,4 @@ private:
 
 } // namespace lldb_private
 
-#endif  // liblldb_ObjectFile_h_
-
+#endif // liblldb_ObjectFile_h_
diff --git a/lldb/include/lldb/Symbol/Symbol.h b/lldb/include/lldb/Symbol/Symbol.h
index f9438b006c4..c77d3dea4bd 100644
--- a/lldb/include/lldb/Symbol/Symbol.h
+++ b/lldb/include/lldb/Symbol/Symbol.h
@@ -333,6 +333,7 @@ public:
     {
         return m_demangled_is_synthesized;
     }
+
     void
     SetDemangledNameIsSynthesized(bool b)
     {
@@ -354,22 +355,22 @@ public:
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    CalculateSymbolContext (SymbolContext *sc);
+    void
+    CalculateSymbolContext(SymbolContext *sc) override;
 
-    virtual lldb::ModuleSP
-    CalculateSymbolContextModule ();
+    lldb::ModuleSP
+    CalculateSymbolContextModule() override;
     
-    virtual Symbol *
-    CalculateSymbolContextSymbol ();
+    Symbol *
+    CalculateSymbolContextSymbol() override;
 
     //------------------------------------------------------------------
     /// @copydoc SymbolContextScope::DumpSymbolContext(Stream*)
     ///
     /// @see SymbolContextScope
     //------------------------------------------------------------------
-    virtual void
-    DumpSymbolContext (Stream *s);
+    void
+    DumpSymbolContext(Stream *s) override;
 
     lldb::DisassemblerSP
     GetInstructions (const ExecutionContext &exe_ctx,
@@ -411,4 +412,4 @@ protected:
 
 } // namespace lldb_private
 
-#endif  // liblldb_Symbol_h_
+#endif // liblldb_Symbol_h_
diff --git a/lldb/include/lldb/Symbol/SymbolFile.h b/lldb/include/lldb/Symbol/SymbolFile.h
index 63418625cb8..200e14b16a7 100644
--- a/lldb/include/lldb/Symbol/SymbolFile.h
+++ b/lldb/include/lldb/Symbol/SymbolFile.h
@@ -56,8 +56,7 @@ public:
     {
     }
 
-    virtual
-    ~SymbolFile()
+    ~SymbolFile() override
     {
     }
 
@@ -171,16 +170,15 @@ public:
     { 
     }
 
-    
 protected:
     ObjectFile*             m_obj_file; // The object file that symbols can be extracted from.
     uint32_t                m_abilities;
     bool                    m_calculated_abilities;
+
 private:
     DISALLOW_COPY_AND_ASSIGN (SymbolFile);
 };
 
-
 } // namespace lldb_private
 
-#endif  // liblldb_SymbolFile_h_
+#endif // liblldb_SymbolFile_h_
diff --git a/lldb/include/lldb/Symbol/SymbolVendor.h b/lldb/include/lldb/Symbol/SymbolVendor.h
index cbf2181bffc..4d5157378d7 100644
--- a/lldb/include/lldb/Symbol/SymbolVendor.h
+++ b/lldb/include/lldb/Symbol/SymbolVendor.h
@@ -17,7 +17,6 @@
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Symbol/TypeList.h"
 
-
 namespace lldb_private {
 
 //----------------------------------------------------------------------
@@ -44,8 +43,7 @@ public:
     //------------------------------------------------------------------
     SymbolVendor(const lldb::ModuleSP &module_sp);
 
-    virtual
-    ~SymbolVendor();
+    ~SymbolVendor() override;
 
     void
     AddSymbolFileRepresentation(const lldb::ObjectFileSP &objfile_sp);
@@ -188,11 +186,11 @@ public:
     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
-    virtual ConstString
-    GetPluginName();
+    ConstString
+    GetPluginName() override;
 
-    virtual uint32_t
-    GetPluginVersion();
+    uint32_t
+    GetPluginVersion() override;
 
 protected:
     //------------------------------------------------------------------
@@ -214,7 +212,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN (SymbolVendor);
 };
 
-
 } // namespace lldb_private
 
-#endif  // liblldb_SymbolVendor_h_
+#endif // liblldb_SymbolVendor_h_