diff options
32 files changed, 98 insertions, 98 deletions
diff --git a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp index f2e9a9871df..9c58a8f0cbd 100644 --- a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp +++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp @@ -69,7 +69,7 @@ struct AddOverrideFactory : TransformFactory { } } - Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE { + Transform *createTransform(const TransformOptions &Opts) override { return new AddOverrideTransform(Opts); } }; diff --git a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h index 51222907fad..9c3453d2100 100644 --- a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h +++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h @@ -32,10 +32,10 @@ public: /// \see Transform::run(). virtual int apply(const clang::tooling::CompilationDatabase &Database, - const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE; + const std::vector<std::string> &SourcePaths) override; virtual bool handleBeginSource(clang::CompilerInstance &CI, - llvm::StringRef Filename) LLVM_OVERRIDE; + llvm::StringRef Filename) override; private: AddOverrideFixer *Fixer; diff --git a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp index 975bf7bac06..7f14e073168 100644 --- a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp +++ b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp @@ -66,7 +66,7 @@ private: StringRef FileName, bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File, StringRef SearchPath, StringRef RelativePath, - const Module *Imported) LLVM_OVERRIDE { + const Module *Imported) override { SourceManager &SM = Self->Sources; const FileEntry *FE = SM.getFileEntryForID(SM.getFileID(HashLoc)); assert(FE && "Valid file expected."); @@ -79,7 +79,7 @@ private: // Keep track of the current file in the stack virtual void FileChanged(SourceLocation Loc, FileChangeReason Reason, SrcMgr::CharacteristicKind FileType, - FileID PrevFID) LLVM_OVERRIDE { + FileID PrevFID) override { SourceManager &SM = Self->Sources; switch (Reason) { case EnterFile: @@ -142,7 +142,7 @@ private: } virtual void Ifndef(SourceLocation Loc, const Token &MacroNameTok, - const MacroDirective *MD) LLVM_OVERRIDE { + const MacroDirective *MD) override { Guard->Count++; // If this #ifndef is the top-most directive and the symbol isn't defined @@ -159,7 +159,7 @@ private: } virtual void MacroDefined(const Token &MacroNameTok, - const MacroDirective *MD) LLVM_OVERRIDE { + const MacroDirective *MD) override { Guard->Count++; // If this #define is the second directive of the file and the symbol @@ -176,7 +176,7 @@ private: } } - virtual void Endif(SourceLocation Loc, SourceLocation IfLoc) LLVM_OVERRIDE { + virtual void Endif(SourceLocation Loc, SourceLocation IfLoc) override { Guard->Count++; // If it's the #endif corresponding to the top-most #ifndef @@ -195,30 +195,30 @@ private: } virtual void MacroExpands(const Token &, const MacroDirective *, SourceRange, - const MacroArgs *) LLVM_OVERRIDE { + const MacroArgs *) override { Guard->Count++; } virtual void MacroUndefined(const Token &, - const MacroDirective *) LLVM_OVERRIDE { + const MacroDirective *) override { Guard->Count++; } virtual void Defined(const Token &, const MacroDirective *, - SourceRange) LLVM_OVERRIDE { + SourceRange) override { Guard->Count++; } virtual void If(SourceLocation, SourceRange, - ConditionValueKind) LLVM_OVERRIDE { + ConditionValueKind) override { Guard->Count++; } virtual void Elif(SourceLocation, SourceRange, ConditionValueKind, - SourceLocation) LLVM_OVERRIDE { + SourceLocation) override { Guard->Count++; } virtual void Ifdef(SourceLocation, const Token &, - const MacroDirective *) LLVM_OVERRIDE { + const MacroDirective *) override { Guard->Count++; } - virtual void Else(SourceLocation, SourceLocation) LLVM_OVERRIDE { + virtual void Else(SourceLocation, SourceLocation) override { Guard->Count++; } diff --git a/clang-tools-extra/clang-modernize/Core/Transform.cpp b/clang-tools-extra/clang-modernize/Core/Transform.cpp index 1d4eb766b45..2943f5cfece 100644 --- a/clang-tools-extra/clang-modernize/Core/Transform.cpp +++ b/clang-tools-extra/clang-modernize/Core/Transform.cpp @@ -37,7 +37,7 @@ public: ActionFactory(MatchFinder &Finder, Transform &Owner) : Finder(Finder), Owner(Owner) {} - virtual FrontendAction *create() LLVM_OVERRIDE { + virtual FrontendAction *create() override { return new FactoryAdaptor(Finder, Owner); } @@ -52,14 +52,14 @@ private: } virtual bool BeginSourceFileAction(CompilerInstance &CI, - StringRef Filename) LLVM_OVERRIDE { + StringRef Filename) override { if (!ASTFrontendAction::BeginSourceFileAction(CI, Filename)) return false; return Owner.handleBeginSource(CI, Filename); } - virtual void EndSourceFileAction() LLVM_OVERRIDE { + virtual void EndSourceFileAction() override { Owner.handleEndSource(); return ASTFrontendAction::EndSourceFileAction(); } diff --git a/clang-tools-extra/clang-modernize/Core/Transform.h b/clang-tools-extra/clang-modernize/Core/Transform.h index 6265df41325..459d2a37eda 100644 --- a/clang-tools-extra/clang-modernize/Core/Transform.h +++ b/clang-tools-extra/clang-modernize/Core/Transform.h @@ -291,7 +291,7 @@ struct CompilerVersions { /// Since.Msvc = Version(10); /// } /// -/// Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE { +/// Transform *createTransform(const TransformOptions &Opts) override { /// return new MyTransform(Opts); /// } /// }; diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp index bfd8007f938..39ece5b44d8 100644 --- a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp +++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp @@ -77,7 +77,7 @@ struct LoopConvertFactory : TransformFactory { Since.Msvc = Version(11); } - Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE { + Transform *createTransform(const TransformOptions &Opts) override { return new LoopConvertTransform(Opts); } }; diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h index 7aa3110544c..d7ed6a22772 100644 --- a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h +++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h @@ -18,7 +18,7 @@ #define CLANG_MODERNIZE_LOOP_CONVERT_H #include "Core/Transform.h" -#include "llvm/Support/Compiler.h" // For LLVM_OVERRIDE +#include "llvm/Support/Compiler.h" // For override // Forward decl for private implementation. struct TUTrackingInfo; @@ -32,10 +32,10 @@ public: /// \see Transform::run(). virtual int apply(const clang::tooling::CompilationDatabase &Database, - const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE; + const std::vector<std::string> &SourcePaths) override; virtual bool handleBeginSource(clang::CompilerInstance &CI, - llvm::StringRef Filename) LLVM_OVERRIDE; + llvm::StringRef Filename) override; private: llvm::OwningPtr<TUTrackingInfo> TUInfo; }; diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp index eb4a92470e4..4e44a34e97d 100644 --- a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp +++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp @@ -62,7 +62,7 @@ struct PassByValueFactory : TransformFactory { Since.Msvc = Version(11); } - Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE { + Transform *createTransform(const TransformOptions &Opts) override { return new PassByValueTransform(Opts); } }; diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h index c47bfe12d0b..72006464c84 100644 --- a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h +++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h @@ -59,12 +59,12 @@ public: /// \see Transform::apply(). virtual int apply(const clang::tooling::CompilationDatabase &Database, - const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE; + const std::vector<std::string> &SourcePaths) override; private: /// \brief Setups the \c IncludeDirectives for the replacer. virtual bool handleBeginSource(clang::CompilerInstance &CI, - llvm::StringRef Filename) LLVM_OVERRIDE; + llvm::StringRef Filename) override; llvm::OwningPtr<IncludeDirectives> IncludeManager; ConstructorParamReplacer *Replacer; diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h index bd05c4048a8..4046992f487 100644 --- a/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h +++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h @@ -63,7 +63,7 @@ public: private: /// \brief Entry point to the callback called when matches are made. virtual void run(const clang::ast_matchers::MatchFinder::MatchResult &Result) - LLVM_OVERRIDE; + override; unsigned &AcceptedChanges; unsigned &RejectedChanges; diff --git a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp index 63b033bc913..f08e9cdba74 100644 --- a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp +++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp @@ -52,7 +52,7 @@ struct ReplaceAutoPtrFactory : TransformFactory { Since.Msvc = Version(11); } - Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE { + Transform *createTransform(const TransformOptions &Opts) override { return new ReplaceAutoPtrTransform(Opts); } }; diff --git a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h index a65e4fa28ec..1d3948c8cec 100644 --- a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h +++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h @@ -48,7 +48,7 @@ public: /// \see Transform::run(). virtual int apply(const clang::tooling::CompilationDatabase &Database, - const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE; + const std::vector<std::string> &SourcePaths) override; }; #endif // CLANG_MODERNIZE_REPLACE_AUTO_PTR_H diff --git a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h index 3b3866d8367..fbe5518ee18 100644 --- a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h +++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h @@ -30,7 +30,7 @@ public: /// \brief Entry point to the callback called when matches are made. virtual void run(const clang::ast_matchers::MatchFinder::MatchResult &Result) - LLVM_OVERRIDE; + override; private: /// \brief Locates the \c auto_ptr token when it is referred by a \c TypeLoc. @@ -89,7 +89,7 @@ public: /// \brief Entry point to the callback called when matches are made. virtual void run(const clang::ast_matchers::MatchFinder::MatchResult &Result) - LLVM_OVERRIDE; + override; private: unsigned &AcceptedChanges; diff --git a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp index ff622b25a86..72b97acd39e 100644 --- a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp +++ b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp @@ -54,7 +54,7 @@ struct UseAutoFactory : TransformFactory { Since.Msvc = Version(10); } - Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE { + Transform *createTransform(const TransformOptions &Opts) override { return new UseAutoTransform(Opts); } }; diff --git a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h index 3c892a026cb..8fe6d83ac03 100644 --- a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h +++ b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h @@ -35,7 +35,7 @@ public: /// \see Transform::run(). virtual int apply(const clang::tooling::CompilationDatabase &Database, - const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE; + const std::vector<std::string> &SourcePaths) override; }; #endif // CLANG_MODERNIZE_USE_AUTO_H diff --git a/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h index 7cf8feb9ec6..048d7598c1d 100644 --- a/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h +++ b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h @@ -30,7 +30,7 @@ public: /// \brief Entry point to the callback called when matches are made. virtual void run(const clang::ast_matchers::MatchFinder::MatchResult &Result) - LLVM_OVERRIDE; + override; private: unsigned &AcceptedChanges; @@ -46,7 +46,7 @@ public: /// \brief Entry point to the callback called when matches are made. virtual void run(const clang::ast_matchers::MatchFinder::MatchResult &Result) - LLVM_OVERRIDE; + override; private: unsigned &AcceptedChanges; diff --git a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp index 1ddc991e0c4..9d63f76adb5 100644 --- a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp +++ b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp @@ -65,7 +65,7 @@ struct UseNullptrFactory : TransformFactory { Since.Msvc = Version(10); } - Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE { + Transform *createTransform(const TransformOptions &Opts) override { return new UseNullptrTransform(Opts); } }; diff --git a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h index c3d86697c7d..7811e8fbd54 100644 --- a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h +++ b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h @@ -18,7 +18,7 @@ #define CLANG_MODERNIZE_USE_NULLPTR_H #include "Core/Transform.h" -#include "llvm/Support/Compiler.h" // For LLVM_OVERRIDE +#include "llvm/Support/Compiler.h" // For override /// \brief Subclass of Transform that transforms null pointer constants into /// C++11's nullptr keyword where possible. @@ -29,7 +29,7 @@ public: /// \see Transform::run(). virtual int apply(const clang::tooling::CompilationDatabase &Database, - const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE; + const std::vector<std::string> &SourcePaths) override; }; #endif // CLANG_MODERNIZE_USE_NULLPTR_H diff --git a/clang-tools-extra/clang-query/Query.h b/clang-tools-extra/clang-query/Query.h index eeeb1b95988..60514f73d10 100644 --- a/clang-tools-extra/clang-query/Query.h +++ b/clang-tools-extra/clang-query/Query.h @@ -52,7 +52,7 @@ typedef llvm::IntrusiveRefCntPtr<Query> QueryRef; /// Any query which resulted in a parse error. The error message is in ErrStr. struct InvalidQuery : Query { InvalidQuery(const Twine &ErrStr) : Query(QK_Invalid), ErrStr(ErrStr.str()) {} - bool run(llvm::raw_ostream &OS, QuerySession &QS) const LLVM_OVERRIDE; + bool run(llvm::raw_ostream &OS, QuerySession &QS) const override; std::string ErrStr; @@ -62,7 +62,7 @@ struct InvalidQuery : Query { /// No-op query (i.e. a blank line). struct NoOpQuery : Query { NoOpQuery() : Query(QK_NoOp) {} - bool run(llvm::raw_ostream &OS, QuerySession &QS) const LLVM_OVERRIDE; + bool run(llvm::raw_ostream &OS, QuerySession &QS) const override; static bool classof(const Query *Q) { return Q->Kind == QK_NoOp; } }; @@ -70,7 +70,7 @@ struct NoOpQuery : Query { /// Query for "help". struct HelpQuery : Query { HelpQuery() : Query(QK_Help) {} - bool run(llvm::raw_ostream &OS, QuerySession &QS) const LLVM_OVERRIDE; + bool run(llvm::raw_ostream &OS, QuerySession &QS) const override; static bool classof(const Query *Q) { return Q->Kind == QK_Help; } }; @@ -79,7 +79,7 @@ struct HelpQuery : Query { struct MatchQuery : Query { MatchQuery(const ast_matchers::dynamic::DynTypedMatcher &Matcher) : Query(QK_Match), Matcher(Matcher) {} - bool run(llvm::raw_ostream &OS, QuerySession &QS) const LLVM_OVERRIDE; + bool run(llvm::raw_ostream &OS, QuerySession &QS) const override; ast_matchers::dynamic::DynTypedMatcher Matcher; @@ -100,7 +100,7 @@ template <> struct SetQueryKind<OutputKind> { template <typename T> struct SetQuery : Query { SetQuery(T QuerySession::*Var, T Value) : Query(SetQueryKind<T>::value), Var(Var), Value(Value) {} - bool run(llvm::raw_ostream &OS, QuerySession &QS) const LLVM_OVERRIDE { + bool run(llvm::raw_ostream &OS, QuerySession &QS) const override { QS.*Var = Value; return true; } diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp index d357cdaa5f6..b812a645e96 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp @@ -65,7 +65,7 @@ public: AnalyzerDiagnosticConsumer(ClangTidyContext &Context) : Context(Context) {} void FlushDiagnosticsImpl(std::vector<const ento::PathDiagnostic *> &Diags, - FilesMade *filesMade) LLVM_OVERRIDE { + FilesMade *filesMade) override { for (std::vector<const ento::PathDiagnostic *>::iterator I = Diags.begin(), E = Diags.end(); I != E; ++I) { @@ -88,9 +88,9 @@ public: } } - StringRef getName() const LLVM_OVERRIDE { return "ClangTidyDiags"; } - bool supportsLogicalOpControlFlow() const LLVM_OVERRIDE { return true; } - bool supportsCrossFileDiagnostics() const LLVM_OVERRIDE { return true; } + StringRef getName() const override { return "ClangTidyDiags"; } + bool supportsLogicalOpControlFlow() const override { return true; } + bool supportsCrossFileDiagnostics() const override { return true; } private: ClangTidyContext &Context; @@ -265,7 +265,7 @@ void runClangTidy(StringRef EnableChecksRegex, StringRef DisableChecksRegex, public: ActionFactory(ClangTidyASTConsumerFactory *ConsumerFactory) : ConsumerFactory(ConsumerFactory) {} - FrontendAction *create() LLVM_OVERRIDE { + FrontendAction *create() override { return new Action(ConsumerFactory); } @@ -274,7 +274,7 @@ void runClangTidy(StringRef EnableChecksRegex, StringRef DisableChecksRegex, public: Action(ClangTidyASTConsumerFactory *Factory) : Factory(Factory) {} ASTConsumer *CreateASTConsumer(CompilerInstance &Compiler, - StringRef File) LLVM_OVERRIDE { + StringRef File) override { return Factory->CreateASTConsumer(Compiler, File); } diff --git a/clang-tools-extra/clang-tidy/ClangTidy.h b/clang-tools-extra/clang-tidy/ClangTidy.h index d26ea8fb2e9..388ac1cfae8 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.h +++ b/clang-tools-extra/clang-tidy/ClangTidy.h @@ -83,7 +83,7 @@ public: void setName(StringRef Name); private: - void run(const ast_matchers::MatchFinder::MatchResult &Result) LLVM_OVERRIDE; + void run(const ast_matchers::MatchFinder::MatchResult &Result) override; ClangTidyContext *Context; std::string CheckName; }; diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h index cd2016b6531..76b6aaa4ba6 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h @@ -117,10 +117,10 @@ public: // more generic and should be pulled out into a more useful Diagnostics // library. void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel, - const Diagnostic &Info) LLVM_OVERRIDE; + const Diagnostic &Info) override; // Flushes the internal diagnostics buffer to the ClangTidyContext. - void finish() LLVM_OVERRIDE; + void finish() override; private: void addFixes(const Diagnostic &Info, ClangTidyError &Error); diff --git a/clang-tools-extra/clang-tidy/ClangTidyModule.h b/clang-tools-extra/clang-tidy/ClangTidyModule.h index afaa54916e3..3d45ee23bab 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyModule.h +++ b/clang-tools-extra/clang-tidy/ClangTidyModule.h @@ -36,7 +36,7 @@ public: /// For example, if have a clang-tidy check like: /// \code /// class MyTidyCheck : public ClangTidyCheck { -/// void registerMatchers(ast_matchers::MatchFinder *Finder) LLVM_OVERRIDE { +/// void registerMatchers(ast_matchers::MatchFinder *Finder) override { /// .. /// } /// }; @@ -45,7 +45,7 @@ public: /// \code /// class MyModule : public ClangTidyModule { /// void -/// addCheckFactories(ClangTidyCheckFactories &CheckFactories) LLVM_OVERRIDE { +/// addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { /// CheckFactories.addCheckFactory( /// "myproject-my-check", new ClangTidyCheckFactory<MyTidyCheck>()); /// } @@ -53,7 +53,7 @@ public: /// \endcode template <typename T> class ClangTidyCheckFactory : public CheckFactoryBase { public: - ClangTidyCheck *createCheck() LLVM_OVERRIDE { return new T; } + ClangTidyCheck *createCheck() override { return new T; } }; class ClangTidyCheckFactories; diff --git a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp index 7aa64e95020..b4c512d9527 100644 --- a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp @@ -45,7 +45,7 @@ void ExplicitConstructorCheck::check(const MatchFinder::MatchResult &Result) { class GoogleModule : public ClangTidyModule { public: void - addCheckFactories(ClangTidyCheckFactories &CheckFactories) LLVM_OVERRIDE { + addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { CheckFactories.addCheckFactory( "google-explicit-constructor", new ClangTidyCheckFactory<ExplicitConstructorCheck>()); diff --git a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.h b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.h index a1da67c53ac..1077ffe0c19 100644 --- a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.h +++ b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.h @@ -21,9 +21,9 @@ namespace tidy { /// http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Explicit_Constructors class ExplicitConstructorCheck : public ClangTidyCheck { public: - void registerMatchers(ast_matchers::MatchFinder *Finder) LLVM_OVERRIDE; + void registerMatchers(ast_matchers::MatchFinder *Finder) override; void - check(const ast_matchers::MatchFinder::MatchResult &Result) LLVM_OVERRIDE; + check(const ast_matchers::MatchFinder::MatchResult &Result) override; }; } // namespace tidy diff --git a/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp b/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp index 04d0335cf66..3fa8517aeb2 100644 --- a/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.cpp @@ -60,7 +60,7 @@ public: StringRef FileName, bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File, StringRef SearchPath, StringRef RelativePath, - const Module *Imported) LLVM_OVERRIDE { + const Module *Imported) override { // FIXME: This is a dummy implementation to show how to get at preprocessor // information. Implement a real include order check. Check.diag(HashLoc, "This is an include"); @@ -79,7 +79,7 @@ void IncludeOrderCheck::registerPPCallbacks(CompilerInstance &Compiler) { class LLVMModule : public ClangTidyModule { public: void - addCheckFactories(ClangTidyCheckFactories &CheckFactories) LLVM_OVERRIDE { + addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { CheckFactories.addCheckFactory( "llvm-include-order", new ClangTidyCheckFactory<IncludeOrderCheck>()); CheckFactories.addCheckFactory( diff --git a/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.h b/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.h index cd786bc99e3..10b393c2105 100644 --- a/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.h +++ b/clang-tools-extra/clang-tidy/llvm/LLVMTidyModule.h @@ -20,7 +20,7 @@ namespace tidy { /// see: http://llvm.org/docs/CodingStandards.html#include-style class IncludeOrderCheck : public ClangTidyCheck { public: - void registerPPCallbacks(CompilerInstance &Compiler) LLVM_OVERRIDE; + void registerPPCallbacks(CompilerInstance &Compiler) override; }; /// \brief Checks that long namespaces have a closing comment. @@ -28,9 +28,9 @@ public: /// see: http://llvm.org/docs/CodingStandards.html#namespace-indentation class NamespaceCommentCheck : public ClangTidyCheck { public: - void registerMatchers(ast_matchers::MatchFinder *Finder) LLVM_OVERRIDE; + void registerMatchers(ast_matchers::MatchFinder *Finder) override; void - check(const ast_matchers::MatchFinder::MatchResult &Result) LLVM_OVERRIDE; + check(const ast_matchers::MatchFinder::MatchResult &Result) override; }; } // namespace tidy diff --git a/clang-tools-extra/docs/AddOverrideTransform.rst b/clang-tools-extra/docs/AddOverrideTransform.rst index ea7e3140783..1e1a56ba956 100644 --- a/clang-tools-extra/docs/AddOverrideTransform.rst +++ b/clang-tools-extra/docs/AddOverrideTransform.rst @@ -28,7 +28,7 @@ For example: Using Expands-to-Override Macros ================================ -Like LLVM's ``LLVM_OVERRIDE``, several projects have macros that conditionally +Like LLVM's ``override``, several projects have macros that conditionally expand to the ``override`` keyword when compiling with C++11 features enabled. To maintain compatibility with non-C++11 builds, the Add-Override Transform supports detection and use of these macros instead of using the ``override`` diff --git a/clang-tools-extra/docs/clang-tidy.rst b/clang-tools-extra/docs/clang-tidy.rst index 1ed9b7904cf..dd44b466087 100644 --- a/clang-tools-extra/docs/clang-tidy.rst +++ b/clang-tools-extra/docs/clang-tidy.rst @@ -260,7 +260,7 @@ The check should be registered in the corresponding module with a distinct name: class MyModule : public ClangTidyModule { public: virtual void - addCheckFactories(ClangTidyCheckFactories &CheckFactories) LLVM_OVERRIDE { + addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { CheckFactories.addCheckFactory( "my-explicit-constructor", new ClangTidyCheckFactory<ExplicitConstructorCheck>()); diff --git a/clang-tools-extra/pp-trace/PPCallbacksTracker.h b/clang-tools-extra/pp-trace/PPCallbacksTracker.h index 29c6feded16..bf06423c6f2 100644 --- a/clang-tools-extra/pp-trace/PPCallbacksTracker.h +++ b/clang-tools-extra/pp-trace/PPCallbacksTracker.h @@ -83,12 +83,12 @@ public: void FileChanged(clang::SourceLocation Loc, clang::PPCallbacks::FileChangeReason Reason, clang::SrcMgr::CharacteristicKind FileType, - clang::FileID PrevFID = clang::FileID()) LLVM_OVERRIDE; + clang::FileID PrevFID = clang::FileID()) override; void FileSkipped(const clang::FileEntry &ParentFile, const clang::Token &FilenameTok, - clang::SrcMgr::CharacteristicKind FileType) LLVM_OVERRIDE; + clang::SrcMgr::CharacteristicKind FileType) override; bool FileNotFound(llvm::StringRef FileName, - llvm::SmallVectorImpl<char> &RecoveryPath) LLVM_OVERRIDE; + llvm::SmallVectorImpl<char> &RecoveryPath) override; void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, llvm::StringRef FileName, bool IsAngled, @@ -96,61 +96,61 @@ public: const clang::FileEntry *File, llvm::StringRef SearchPath, llvm::StringRef RelativePath, - const clang::Module *Imported) LLVM_OVERRIDE; + const clang::Module *Imported) override; void moduleImport(clang::SourceLocation ImportLoc, clang::ModuleIdPath Path, - const clang::Module *Imported) LLVM_OVERRIDE; - void EndOfMainFile() LLVM_OVERRIDE; - void Ident(clang::SourceLocation Loc, const std::string &str) LLVM_OVERRIDE; + const clang::Module *Imported) override; + void EndOfMainFile() override; + void Ident(clang::SourceLocation Loc, const std::string &str) override; void PragmaDirective(clang::SourceLocation Loc, - clang::PragmaIntroducerKind Introducer) LLVM_OVERRIDE; + clang::PragmaIntroducerKind Introducer) override; void PragmaComment(clang::SourceLocation Loc, const clang::IdentifierInfo *Kind, - const std::string &Str) LLVM_OVERRIDE; + const std::string &Str) override; void PragmaDetectMismatch(clang::SourceLocation Loc, const std::string &Name, - const std::string &Value) LLVM_OVERRIDE; + const std::string &Value) override; void PragmaDebug(clang::SourceLocation Loc, - llvm::StringRef DebugType) LLVM_OVERRIDE; + llvm::StringRef DebugType) override; void PragmaMessage(clang::SourceLocation Loc, llvm::StringRef Namespace, clang::PPCallbacks::PragmaMessageKind Kind, - llvm::StringRef Str) LLVM_OVERRIDE; + llvm::StringRef Str) override; void PragmaDiagnosticPush(clang::SourceLocation Loc, - llvm::StringRef Namespace) LLVM_OVERRIDE; + llvm::StringRef Namespace) override; void PragmaDiagnosticPop(clang::SourceLocation Loc, - llvm::StringRef Namespace) LLVM_OVERRIDE; + llvm::StringRef Namespace) override; void PragmaDiagnostic(clang::SourceLocation Loc, llvm::StringRef Namespace, clang::diag::Mapping mapping, - llvm::StringRef Str) LLVM_OVERRIDE; + llvm::StringRef Str) override; void PragmaOpenCLExtension(clang::SourceLocation NameLoc, const clang::IdentifierInfo *Name, clang::SourceLocation StateLoc, - unsigned State) LLVM_OVERRIDE; + unsigned State) override; void PragmaWarning(clang::SourceLocation Loc, llvm::StringRef WarningSpec, - llvm::ArrayRef<int> Ids) LLVM_OVERRIDE; - void PragmaWarningPush(clang::SourceLocation Loc, int Level) LLVM_OVERRIDE; - void PragmaWarningPop(clang::SourceLocation Loc) LLVM_OVERRIDE; + llvm::ArrayRef<int> Ids) override; + void PragmaWarningPush(clang::SourceLocation Loc, int Level) override; + void PragmaWarningPop(clang::SourceLocation Loc) override; void MacroExpands(const clang::Token &MacroNameTok, const clang::MacroDirective *MD, clang::SourceRange Range, - const clang::MacroArgs *Args) LLVM_OVERRIDE; + const clang::MacroArgs *Args) override; void MacroDefined(const clang::Token &MacroNameTok, - const clang::MacroDirective *MD) LLVM_OVERRIDE; + const clang::MacroDirective *MD) override; void MacroUndefined(const clang::Token &MacroNameTok, - const clang::MacroDirective *MD) LLVM_OVERRIDE; + const clang::MacroDirective *MD) override; void Defined(const clang::Token &MacroNameTok, const clang::MacroDirective *MD, - clang::SourceRange Range) LLVM_OVERRIDE; - void SourceRangeSkipped(clang::SourceRange Range) LLVM_OVERRIDE; + clang::SourceRange Range) override; + void SourceRangeSkipped(clang::SourceRange Range) override; void If(clang::SourceLocation Loc, clang::SourceRange ConditionRange, - ConditionValueKind ConditionValue) LLVM_OVERRIDE; + ConditionValueKind ConditionValue) override; void Elif(clang::SourceLocation Loc, clang::SourceRange ConditionRange, - ConditionValueKind ConditionValue, clang::SourceLocation IfLoc) LLVM_OVERRIDE; + ConditionValueKind ConditionValue, clang::SourceLocation IfLoc) override; void Ifdef(clang::SourceLocation Loc, const clang::Token &MacroNameTok, - const clang::MacroDirective *MD) LLVM_OVERRIDE; + const clang::MacroDirective *MD) override; void Ifndef(clang::SourceLocation Loc, const clang::Token &MacroNameTok, - const clang::MacroDirective *MD) LLVM_OVERRIDE; + const clang::MacroDirective *MD) override; void Else(clang::SourceLocation Loc, - clang::SourceLocation IfLoc) LLVM_OVERRIDE; + clang::SourceLocation IfLoc) override; void Endif(clang::SourceLocation Loc, - clang::SourceLocation IfLoc) LLVM_OVERRIDE; + clang::SourceLocation IfLoc) override; // Helper functions. diff --git a/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp b/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp index d81ae1deecf..94b3d866f92 100644 --- a/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp +++ b/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp @@ -83,7 +83,7 @@ public: private: virtual bool BeginSourceFileAction(CompilerInstance &CI, - StringRef FileName) LLVM_OVERRIDE { + StringRef FileName) override { if (!PreprocessOnlyAction::BeginSourceFileAction(CI, FileName)) return false; VFHelper.mapVirtualFiles(CI.getSourceManager()); @@ -95,7 +95,7 @@ private: return true; } - virtual void EndSourceFileAction() LLVM_OVERRIDE { + virtual void EndSourceFileAction() override { const tooling::Replacement &Replace = FileIncludes->addAngledInclude(FileToModify, Include); if (Replace.isApplicable()) diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h index 1be5f82eac7..71201dbdddd 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h @@ -29,7 +29,7 @@ public: private: bool BeginSourceFileAction(CompilerInstance &Compiler, - llvm::StringRef file_name) LLVM_OVERRIDE { + llvm::StringRef file_name) override { Context->setSourceManager(&Compiler.getSourceManager()); Check.registerPPCallbacks(Compiler); return true; |
