[clang-tools-extra] r202632 - [C++11] Replace LLVM_OVERRIDE with 'override'
Craig Topper
craig.topper at gmail.com
Sun Mar 2 02:20:11 PST 2014
Author: ctopper
Date: Sun Mar 2 04:20:11 2014
New Revision: 202632
URL: http://llvm.org/viewvc/llvm-project?rev=202632&view=rev
Log:
[C++11] Replace LLVM_OVERRIDE with 'override'
Modified:
clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.cpp
clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.h
clang-tools-extra/trunk/clang-modernize/Core/IncludeDirectives.cpp
clang-tools-extra/trunk/clang-modernize/Core/Transform.cpp
clang-tools-extra/trunk/clang-modernize/Core/Transform.h
clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.cpp
clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.h
clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.cpp
clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.h
clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValueActions.h
clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp
clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h
clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h
clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.cpp
clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.h
clang-tools-extra/trunk/clang-modernize/UseAuto/UseAutoActions.h
clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.cpp
clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.h
clang-tools-extra/trunk/clang-query/Query.h
clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp
clang-tools-extra/trunk/clang-tidy/ClangTidy.h
clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h
clang-tools-extra/trunk/clang-tidy/ClangTidyModule.h
clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp
clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.h
clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.cpp
clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.h
clang-tools-extra/trunk/docs/AddOverrideTransform.rst
clang-tools-extra/trunk/docs/clang-tidy.rst
clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h
clang-tools-extra/trunk/unittests/clang-modernize/IncludeDirectivesTest.cpp
clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h
Modified: clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.cpp Sun Mar 2 04:20:11 2014
@@ -69,7 +69,7 @@ struct AddOverrideFactory : TransformFac
}
}
- Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE {
+ Transform *createTransform(const TransformOptions &Opts) override {
return new AddOverrideTransform(Opts);
}
};
Modified: clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.h (original)
+++ clang-tools-extra/trunk/clang-modernize/AddOverride/AddOverride.h Sun Mar 2 04:20:11 2014
@@ -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;
Modified: clang-tools-extra/trunk/clang-modernize/Core/IncludeDirectives.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/Core/IncludeDirectives.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/Core/IncludeDirectives.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/Core/IncludeDirectives.cpp Sun Mar 2 04:20:11 2014
@@ -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++;
}
Modified: clang-tools-extra/trunk/clang-modernize/Core/Transform.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/Core/Transform.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/Core/Transform.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/Core/Transform.cpp Sun Mar 2 04:20:11 2014
@@ -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();
}
Modified: clang-tools-extra/trunk/clang-modernize/Core/Transform.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/Core/Transform.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/Core/Transform.h (original)
+++ clang-tools-extra/trunk/clang-modernize/Core/Transform.h Sun Mar 2 04:20:11 2014
@@ -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);
/// }
/// };
Modified: clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.cpp Sun Mar 2 04:20:11 2014
@@ -77,7 +77,7 @@ struct LoopConvertFactory : TransformFac
Since.Msvc = Version(11);
}
- Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE {
+ Transform *createTransform(const TransformOptions &Opts) override {
return new LoopConvertTransform(Opts);
}
};
Modified: clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.h (original)
+++ clang-tools-extra/trunk/clang-modernize/LoopConvert/LoopConvert.h Sun Mar 2 04:20:11 2014
@@ -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;
};
Modified: clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.cpp Sun Mar 2 04:20:11 2014
@@ -62,7 +62,7 @@ struct PassByValueFactory : TransformFac
Since.Msvc = Version(11);
}
- Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE {
+ Transform *createTransform(const TransformOptions &Opts) override {
return new PassByValueTransform(Opts);
}
};
Modified: clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.h (original)
+++ clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValue.h Sun Mar 2 04:20:11 2014
@@ -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;
Modified: clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValueActions.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValueActions.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValueActions.h (original)
+++ clang-tools-extra/trunk/clang-modernize/PassByValue/PassByValueActions.h Sun Mar 2 04:20:11 2014
@@ -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;
Modified: clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp Sun Mar 2 04:20:11 2014
@@ -52,7 +52,7 @@ struct ReplaceAutoPtrFactory : Transform
Since.Msvc = Version(11);
}
- Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE {
+ Transform *createTransform(const TransformOptions &Opts) override {
return new ReplaceAutoPtrTransform(Opts);
}
};
Modified: clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h (original)
+++ clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h Sun Mar 2 04:20:11 2014
@@ -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
Modified: clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h (original)
+++ clang-tools-extra/trunk/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h Sun Mar 2 04:20:11 2014
@@ -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;
Modified: clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.cpp Sun Mar 2 04:20:11 2014
@@ -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);
}
};
Modified: clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.h (original)
+++ clang-tools-extra/trunk/clang-modernize/UseAuto/UseAuto.h Sun Mar 2 04:20:11 2014
@@ -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
Modified: clang-tools-extra/trunk/clang-modernize/UseAuto/UseAutoActions.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/UseAuto/UseAutoActions.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/UseAuto/UseAutoActions.h (original)
+++ clang-tools-extra/trunk/clang-modernize/UseAuto/UseAutoActions.h Sun Mar 2 04:20:11 2014
@@ -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;
Modified: clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.cpp (original)
+++ clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.cpp Sun Mar 2 04:20:11 2014
@@ -65,7 +65,7 @@ struct UseNullptrFactory : TransformFact
Since.Msvc = Version(10);
}
- Transform *createTransform(const TransformOptions &Opts) LLVM_OVERRIDE {
+ Transform *createTransform(const TransformOptions &Opts) override {
return new UseNullptrTransform(Opts);
}
};
Modified: clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.h (original)
+++ clang-tools-extra/trunk/clang-modernize/UseNullptr/UseNullptr.h Sun Mar 2 04:20:11 2014
@@ -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
Modified: clang-tools-extra/trunk/clang-query/Query.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-query/Query.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-query/Query.h (original)
+++ clang-tools-extra/trunk/clang-query/Query.h Sun Mar 2 04:20:11 2014
@@ -52,7 +52,7 @@ typedef llvm::IntrusiveRefCntPtr<Query>
/// 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<OutputKi
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;
}
Modified: clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp Sun Mar 2 04:20:11 2014
@@ -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 EnableChecks
public:
ActionFactory(ClangTidyASTConsumerFactory *ConsumerFactory)
: ConsumerFactory(ConsumerFactory) {}
- FrontendAction *create() LLVM_OVERRIDE {
+ FrontendAction *create() override {
return new Action(ConsumerFactory);
}
@@ -274,7 +274,7 @@ void runClangTidy(StringRef EnableChecks
public:
Action(ClangTidyASTConsumerFactory *Factory) : Factory(Factory) {}
ASTConsumer *CreateASTConsumer(CompilerInstance &Compiler,
- StringRef File) LLVM_OVERRIDE {
+ StringRef File) override {
return Factory->CreateASTConsumer(Compiler, File);
}
Modified: clang-tools-extra/trunk/clang-tidy/ClangTidy.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/ClangTidy.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/ClangTidy.h (original)
+++ clang-tools-extra/trunk/clang-tidy/ClangTidy.h Sun Mar 2 04:20:11 2014
@@ -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;
};
Modified: clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h (original)
+++ clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h Sun Mar 2 04:20:11 2014
@@ -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);
Modified: clang-tools-extra/trunk/clang-tidy/ClangTidyModule.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/ClangTidyModule.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/ClangTidyModule.h (original)
+++ clang-tools-extra/trunk/clang-tidy/ClangTidyModule.h Sun Mar 2 04:20:11 2014
@@ -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;
Modified: clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp Sun Mar 2 04:20:11 2014
@@ -45,7 +45,7 @@ void ExplicitConstructorCheck::check(con
class GoogleModule : public ClangTidyModule {
public:
void
- addCheckFactories(ClangTidyCheckFactories &CheckFactories) LLVM_OVERRIDE {
+ addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
CheckFactories.addCheckFactory(
"google-explicit-constructor",
new ClangTidyCheckFactory<ExplicitConstructorCheck>());
Modified: clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.h (original)
+++ clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.h Sun Mar 2 04:20:11 2014
@@ -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
Modified: clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.cpp Sun Mar 2 04:20:11 2014
@@ -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::registerPPCallba
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(
Modified: clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.h (original)
+++ clang-tools-extra/trunk/clang-tidy/llvm/LLVMTidyModule.h Sun Mar 2 04:20:11 2014
@@ -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
Modified: clang-tools-extra/trunk/docs/AddOverrideTransform.rst
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/docs/AddOverrideTransform.rst?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/docs/AddOverrideTransform.rst (original)
+++ clang-tools-extra/trunk/docs/AddOverrideTransform.rst Sun Mar 2 04:20:11 2014
@@ -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``
Modified: clang-tools-extra/trunk/docs/clang-tidy.rst
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/docs/clang-tidy.rst?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/docs/clang-tidy.rst (original)
+++ clang-tools-extra/trunk/docs/clang-tidy.rst Sun Mar 2 04:20:11 2014
@@ -260,7 +260,7 @@ The check should be registered in the co
class MyModule : public ClangTidyModule {
public:
virtual void
- addCheckFactories(ClangTidyCheckFactories &CheckFactories) LLVM_OVERRIDE {
+ addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
CheckFactories.addCheckFactory(
"my-explicit-constructor",
new ClangTidyCheckFactory<ExplicitConstructorCheck>());
Modified: clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h (original)
+++ clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h Sun Mar 2 04:20:11 2014
@@ -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.
Modified: clang-tools-extra/trunk/unittests/clang-modernize/IncludeDirectivesTest.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-modernize/IncludeDirectivesTest.cpp?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clang-modernize/IncludeDirectivesTest.cpp (original)
+++ clang-tools-extra/trunk/unittests/clang-modernize/IncludeDirectivesTest.cpp Sun Mar 2 04:20:11 2014
@@ -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())
Modified: clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h?rev=202632&r1=202631&r2=202632&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h (original)
+++ clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h Sun Mar 2 04:20:11 2014
@@ -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;
More information about the cfe-commits
mailing list