From 2325e38024d095b9780e709cc8ca134aab1941fb Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Wed, 10 Dec 2014 22:29:58 +0000 Subject: [PATCH] Fix a bunch of [-Werror,-Winconsistent-missing-override] warnings. llvm-svn: 223973 --- .../Breakpoint/BreakpointResolverAddress.h | 24 +++++++------- .../Breakpoint/BreakpointResolverFileRegex.h | 16 +++++----- lldb/source/Target/LanguageRuntime.cpp | 32 +++++++++---------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h b/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h index 6c85112d2310..c8f034d7345b 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h +++ b/lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h @@ -34,27 +34,27 @@ public: virtual ~BreakpointResolverAddress (); - virtual void - ResolveBreakpoint (SearchFilter &filter); + void + ResolveBreakpoint (SearchFilter &filter) override; - virtual void + void ResolveBreakpointInModules (SearchFilter &filter, - ModuleList &modules); + ModuleList &modules) override; - virtual Searcher::CallbackReturn + Searcher::CallbackReturn SearchCallback (SearchFilter &filter, SymbolContext &context, Address *addr, - bool containing); + bool containing) override; - virtual Searcher::Depth - GetDepth (); + Searcher::Depth + GetDepth () override; - virtual void - GetDescription (Stream *s); + void + GetDescription (Stream *s) override; - virtual void - Dump (Stream *s) const; + void + Dump (Stream *s) const override; /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const BreakpointResolverAddress *) { return true; } diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h b/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h index 0a49833b67d1..2c05ac1c87da 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h +++ b/lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h @@ -34,20 +34,20 @@ public: virtual ~BreakpointResolverFileRegex (); - virtual Searcher::CallbackReturn + Searcher::CallbackReturn SearchCallback (SearchFilter &filter, SymbolContext &context, Address *addr, - bool containing); + bool containing) override; - virtual Searcher::Depth - GetDepth (); + Searcher::Depth + GetDepth () override; - virtual void - GetDescription (Stream *s); + void + GetDescription (Stream *s) override; - virtual void - Dump (Stream *s) const; + void + Dump (Stream *s) const override; /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const BreakpointResolverFileRegex *) { return true; } diff --git a/lldb/source/Target/LanguageRuntime.cpp b/lldb/source/Target/LanguageRuntime.cpp index 32faa1788f88..358bffee3a4d 100644 --- a/lldb/source/Target/LanguageRuntime.cpp +++ b/lldb/source/Target/LanguageRuntime.cpp @@ -34,8 +34,8 @@ public: virtual ~ExceptionSearchFilter() {}; - virtual bool - ModulePasses (const lldb::ModuleSP &module_sp) + bool + ModulePasses (const lldb::ModuleSP &module_sp) override { UpdateModuleListIfNeeded (); if (m_filter_sp) @@ -43,8 +43,8 @@ public: return false; } - virtual bool - ModulePasses (const FileSpec &spec) + bool + ModulePasses (const FileSpec &spec) override { UpdateModuleListIfNeeded (); if (m_filter_sp) @@ -53,16 +53,16 @@ public: } - virtual void - Search (Searcher &searcher) + void + Search (Searcher &searcher) override { UpdateModuleListIfNeeded (); if (m_filter_sp) m_filter_sp->Search (searcher); } - virtual void - GetDescription (Stream *s) + void + GetDescription (Stream *s) override { UpdateModuleListIfNeeded (); if (m_filter_sp) @@ -136,11 +136,11 @@ public: { } - virtual Searcher::CallbackReturn + Searcher::CallbackReturn SearchCallback (SearchFilter &filter, SymbolContext &context, Address *addr, - bool containing) + bool containing) override { if (SetActualResolver()) @@ -149,8 +149,8 @@ public: return eCallbackReturnStop; } - virtual Searcher::Depth - GetDepth () + Searcher::Depth + GetDepth () override { if (SetActualResolver()) return m_actual_resolver_sp->GetDepth(); @@ -158,8 +158,8 @@ public: return eDepthTarget; } - virtual void - GetDescription (Stream *s) + void + GetDescription (Stream *s) override { s->Printf ("Exception breakpoint (catch: %s throw: %s)", m_catch_bp ? "on" : "off", @@ -175,8 +175,8 @@ public: s->Printf (" the correct runtime exception handler will be determined when you run"); } - virtual void - Dump (Stream *s) const + void + Dump (Stream *s) const override { }