diff options
Diffstat (limited to 'clang-tools-extra/clang-modernize')
6 files changed, 15 insertions, 5 deletions
diff --git a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp index c655cd615ed..fdfde5f2e37 100644 --- a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp +++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp @@ -56,6 +56,7 @@ bool AddOverrideTransform::handleBeginSource(clang::CompilerInstance &CI, return Transform::handleBeginSource(CI, Filename); } +namespace { struct AddOverrideFactory : TransformFactory { AddOverrideFactory() { // if detecting macros is enabled, do not impose requirements on the @@ -73,6 +74,7 @@ struct AddOverrideFactory : TransformFactory { return new AddOverrideTransform(Opts); } }; +} // namespace // Register the factory using this statically initialized variable. static TransformFactoryRegistry::Add<AddOverrideFactory> diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp index 9c30d5f5ea1..408563dc848 100644 --- a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp +++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp @@ -69,6 +69,7 @@ LoopConvertTransform::handleBeginSource(clang::CompilerInstance &CI, return Transform::handleBeginSource(CI, Filename); } +namespace { struct LoopConvertFactory : TransformFactory { LoopConvertFactory() { Since.Clang = Version(3, 0); @@ -81,6 +82,7 @@ struct LoopConvertFactory : TransformFactory { return new LoopConvertTransform(Opts); } }; +} // namespace // Register the factory using this statically initialized variable. static TransformFactoryRegistry::Add<LoopConvertFactory> diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp index ac6e568defc..40b3d659d90 100644 --- a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp +++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp @@ -53,6 +53,7 @@ bool PassByValueTransform::handleBeginSource(CompilerInstance &CI, return Transform::handleBeginSource(CI, Filename); } +namespace { struct PassByValueFactory : TransformFactory { PassByValueFactory() { // Based on the Replace Auto-Ptr Transform that is also using std::move(). @@ -66,6 +67,7 @@ struct PassByValueFactory : TransformFactory { return new PassByValueTransform(Opts); } }; +} // namespace // Register the factory using this statically initialized variable. static TransformFactoryRegistry::Add<PassByValueFactory> diff --git a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp index e3d958b9231..a9c81873cda 100644 --- a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp +++ b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp @@ -46,6 +46,7 @@ int UseAutoTransform::apply(const clang::tooling::CompilationDatabase &Database, return 0; } +namespace { struct UseAutoFactory : TransformFactory { UseAutoFactory() { Since.Clang = Version(2, 9); @@ -58,6 +59,7 @@ struct UseAutoFactory : TransformFactory { return new UseAutoTransform(Opts); } }; +} // namespace // Register the factory using this statically initialized variable. static TransformFactoryRegistry::Add<UseAutoFactory> diff --git a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp index f76a2b28561..916d1c73707 100644 --- a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp +++ b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp @@ -56,6 +56,7 @@ int UseNullptrTransform::apply(const CompilationDatabase &Database, return 0; } +namespace { struct UseNullptrFactory : TransformFactory { UseNullptrFactory() { Since.Clang = Version(3, 0); @@ -68,6 +69,7 @@ struct UseNullptrFactory : TransformFactory { return new UseNullptrTransform(Opts); } }; +} // namespace // Register the factory using this statically initialized variable. static TransformFactoryRegistry::Add<UseNullptrFactory> diff --git a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp index 842a28e8e93..e8066c0960a 100644 --- a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp +++ b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp @@ -36,7 +36,7 @@ namespace cl = llvm::cl; using namespace clang; using namespace clang::tooling; -TransformOptions GlobalOptions; +static TransformOptions GlobalOptions; // All options must belong to locally defined categories for them to get shown // by -help. We explicitly hide everything else (except -help and -version). @@ -45,7 +45,7 @@ static cl::OptionCategory FormattingCategory("Formatting Options"); static cl::OptionCategory IncludeExcludeCategory("Inclusion/Exclusion Options"); static cl::OptionCategory SerializeCategory("Serialization Options"); -const cl::OptionCategory *VisibleCategories[] = { +static const cl::OptionCategory *VisibleCategories[] = { &GeneralCategory, &FormattingCategory, &IncludeExcludeCategory, &SerializeCategory, &TransformCategory, &TransformsOptionsCategory, }; @@ -112,7 +112,7 @@ TimingDirectoryName("perf", cl::ValueOptional, cl::value_desc("directory name"), cl::cat(GeneralCategory)); -cl::opt<std::string> SupportedCompilers( +static cl::opt<std::string> SupportedCompilers( "for-compilers", cl::value_desc("string"), cl::desc("Select transforms targeting the intersection of\n" "language features supported by the given compilers.\n" @@ -189,7 +189,7 @@ SerializeLocation("serialize-dir", //////////////////////////////////////////////////////////////////////////////// -void printVersion() { +static void printVersion() { llvm::outs() << "clang-modernizer version " CLANG_VERSION_STRING << "\n"; } @@ -248,7 +248,7 @@ static CompilerVersions handleSupportedCompilers(const char *ProgName, return RequiredVersions; } -std::unique_ptr<CompilationDatabase> +static std::unique_ptr<CompilationDatabase> autoDetectCompilations(std::string &ErrorMessage) { // Auto-detect a compilation database from BuildPath. if (BuildPath.getNumOccurrences() > 0) |
