From 6a2dc5c3814916c57f23cbd0ca5375365a6f96c1 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Sun, 9 Mar 2014 09:24:40 +0000 Subject: [C++11] Replace OwningPtr with std::unique_ptr. This removes all references to OwningPtr, which should be fairly undisruptive to out-of-tree projects since they are unlikely to use clang-tools-extra as a library instead of a set of tools. llvm-svn: 203382 --- .../lib/Tooling/ApplyReplacements.cpp | 2 +- .../tool/ClangApplyReplacementsMain.cpp | 2 +- clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp | 5 ++--- clang-tools-extra/clang-modernize/Core/Transform.h | 1 - clang-tools-extra/clang-modernize/Core/Transforms.cpp | 2 +- clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h | 2 +- clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h | 2 +- clang-tools-extra/clang-modernize/PassByValue/PassByValue.h | 2 +- clang-tools-extra/clang-modernize/tool/ClangModernize.cpp | 2 +- clang-tools-extra/clang-query/tool/ClangQuery.cpp | 5 ++--- clang-tools-extra/clang-tidy/ClangTidy.cpp | 2 +- clang-tools-extra/clang-tidy/ClangTidy.h | 2 +- clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h | 2 +- clang-tools-extra/modularize/Modularize.cpp | 11 +++++------ clang-tools-extra/modularize/ModuleAssistant.cpp | 3 +-- clang-tools-extra/module-map-checker/ModuleMapChecker.cpp | 7 ++++--- clang-tools-extra/module-map-checker/ModuleMapChecker.h | 5 ++--- clang-tools-extra/pp-trace/PPTrace.cpp | 3 +-- clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp | 5 ++--- clang-tools-extra/tool-template/ToolTemplate.cpp | 5 ++--- .../unittests/clang-modernize/IncludeDirectivesTest.cpp | 2 +- clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp | 4 ++-- clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h | 2 +- .../unittests/include/common/VirtualFileHelper.h | 2 +- 24 files changed, 36 insertions(+), 44 deletions(-) diff --git a/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp b/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp index d40504c293b..48787cb07b3 100644 --- a/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp +++ b/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp @@ -59,7 +59,7 @@ collectReplacementsFromDirectory(const llvm::StringRef Directory, TURFiles.push_back(I->path()); - OwningPtr Out; + std::unique_ptr Out; error_code BufferError = MemoryBuffer::getFile(I->path(), Out); if (BufferError) { errs() << "Error reading " << I->path() << ": " << BufferError.message() diff --git a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp index f75b618f7b0..a92b29cad6c 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp +++ b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp @@ -233,7 +233,7 @@ int main(int argc, char **argv) { // Remove the TUReplacementFiles (triggered by "remove-change-desc-files" // command line option) when exiting main(). - OwningPtr Remover; + std::unique_ptr Remover; if (RemoveTUReplacementFiles) Remover.reset(new ScopedFileRemover(TURFiles, Diagnostics)); diff --git a/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp index f796f43ec33..016ce55127e 100644 --- a/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp +++ b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp @@ -14,7 +14,6 @@ //===----------------------------------------------------------------------===// #include "IncludeExcludeInfo.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" @@ -122,7 +121,7 @@ error_code IncludeExcludeInfo::readListFromString(StringRef IncludeString, error_code IncludeExcludeInfo::readListFromFile(StringRef IncludeListFile, StringRef ExcludeListFile) { if (!IncludeListFile.empty()) { - OwningPtr FileBuf; + std::unique_ptr FileBuf; if (error_code Err = MemoryBuffer::getFile(IncludeListFile, FileBuf)) { errs() << "Unable to read from include file.\n"; return Err; @@ -132,7 +131,7 @@ error_code IncludeExcludeInfo::readListFromFile(StringRef IncludeListFile, return Err; } if (!ExcludeListFile.empty()) { - OwningPtr FileBuf; + std::unique_ptr FileBuf; if (error_code Err = MemoryBuffer::getFile(ExcludeListFile, FileBuf)) { errs() << "Unable to read from exclude file.\n"; return Err; diff --git a/clang-tools-extra/clang-modernize/Core/Transform.h b/clang-tools-extra/clang-modernize/Core/Transform.h index 459d2a37eda..0cf94c96be0 100644 --- a/clang-tools-extra/clang-modernize/Core/Transform.h +++ b/clang-tools-extra/clang-modernize/Core/Transform.h @@ -18,7 +18,6 @@ #include "Core/IncludeExcludeInfo.h" #include "Core/Refactoring.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Registry.h" #include "llvm/Support/Timer.h" diff --git a/clang-tools-extra/clang-modernize/Core/Transforms.cpp b/clang-tools-extra/clang-modernize/Core/Transforms.cpp index 3f2e5b11e6d..d265be8cef0 100644 --- a/clang-tools-extra/clang-modernize/Core/Transforms.cpp +++ b/clang-tools-extra/clang-modernize/Core/Transforms.cpp @@ -61,7 +61,7 @@ Transforms::createSelectedTransforms(const TransformOptions &GlobalOptions, if (!OptionEnabled) continue; - llvm::OwningPtr Factory(I->instantiate()); + std::unique_ptr Factory(I->instantiate()); if (Factory->supportsCompilers(RequiredVersions)) ChosenTransforms.push_back(Factory->createTransform(GlobalOptions)); else if (ExplicitlyEnabled) diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h index dfb05a7c97e..a14125ecc5b 100644 --- a/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h +++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h @@ -53,7 +53,7 @@ struct TUTrackingInfo { /// \} private: - llvm::OwningPtr ParentFinder; + std::unique_ptr ParentFinder; StmtGeneratedVarNameMap GeneratedDecls; ReplacedVarsMap ReplacedVars; }; diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h index d7ed6a22772..1121b65944f 100644 --- a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h +++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h @@ -37,7 +37,7 @@ public: virtual bool handleBeginSource(clang::CompilerInstance &CI, llvm::StringRef Filename) override; private: - llvm::OwningPtr TUInfo; + std::unique_ptr TUInfo; }; #endif // CLANG_MODERNIZE_LOOP_CONVERT_H diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h index 72006464c84..cfd45559bac 100644 --- a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h +++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h @@ -66,7 +66,7 @@ private: virtual bool handleBeginSource(clang::CompilerInstance &CI, llvm::StringRef Filename) override; - llvm::OwningPtr IncludeManager; + std::unique_ptr IncludeManager; ConstructorParamReplacer *Replacer; }; diff --git a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp index a2b100e52cb..97862a0ae6f 100644 --- a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp +++ b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp @@ -323,7 +323,7 @@ int main(int argc, const char **argv) { cl::SetVersionPrinter(&printVersion); // Parse options and generate compilations. - OwningPtr Compilations( + std::unique_ptr Compilations( FixedCompilationDatabase::loadFromCommandLine(argc, argv)); cl::ParseCommandLineOptions(argc, argv); diff --git a/clang-tools-extra/clang-query/tool/ClangQuery.cpp b/clang-tools-extra/clang-query/tool/ClangQuery.cpp index f9b62e0866c..92865fb3d85 100644 --- a/clang-tools-extra/clang-query/tool/ClangQuery.cpp +++ b/clang-tools-extra/clang-query/tool/ClangQuery.cpp @@ -32,7 +32,6 @@ #include "clang/Frontend/ASTUnit.h" #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/Tooling.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/LineEditor/LineEditor.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/MemoryBuffer.h" @@ -70,8 +69,8 @@ int main(int argc, const char **argv) { return 1; } - llvm::OwningPtr Compilations( - FixedCompilationDatabase::loadFromCommandLine(argc, argv)); + std::unique_ptr Compilations( + FixedCompilationDatabase::loadFromCommandLine(argc, argv)); if (!Compilations) { // Couldn't find a compilation DB from the command line std::string ErrorMessage; Compilations.reset( diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp index 24d8bfac445..d0a20760cb6 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp @@ -100,7 +100,7 @@ ClangTidyASTConsumerFactory::ClangTidyASTConsumerFactory( for (ClangTidyModuleRegistry::iterator I = ClangTidyModuleRegistry::begin(), E = ClangTidyModuleRegistry::end(); I != E; ++I) { - OwningPtr Module(I->instantiate()); + std::unique_ptr Module(I->instantiate()); Module->addCheckFactories(*CheckFactories); } diff --git a/clang-tools-extra/clang-tidy/ClangTidy.h b/clang-tools-extra/clang-tidy/ClangTidy.h index 68e574b6a3a..392f1fc2d96 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.h +++ b/clang-tools-extra/clang-tidy/ClangTidy.h @@ -124,7 +124,7 @@ private: SmallVector Checks; ClangTidyContext &Context; ast_matchers::MatchFinder Finder; - OwningPtr CheckFactories; + std::unique_ptr CheckFactories; }; /// \brief Fills the list of check names that are enabled when the provided diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h index 76b6aaa4ba6..31173e37919 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h @@ -128,7 +128,7 @@ private: void finalizeLastError(); ClangTidyContext &Context; - OwningPtr Diags; + std::unique_ptr Diags; SmallVector Errors; bool LastErrorRelatesToUserCode; }; diff --git a/clang-tools-extra/modularize/Modularize.cpp b/clang-tools-extra/modularize/Modularize.cpp index 89d3d19ad62..1f93c5da546 100644 --- a/clang-tools-extra/modularize/Modularize.cpp +++ b/clang-tools-extra/modularize/Modularize.cpp @@ -154,7 +154,6 @@ #include "clang/Lex/Preprocessor.h" #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/Tooling.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/Config/config.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" @@ -231,7 +230,7 @@ error_code getHeaderFileNames(SmallVectorImpl &HeaderFileNames, HeaderDirectory = HeaderPrefix; // Read the header list file into a buffer. - OwningPtr listBuffer; + std::unique_ptr listBuffer; if (error_code ec = MemoryBuffer::getFile(ListFileName, listBuffer)) { return ec; } @@ -290,7 +289,7 @@ error_code getHeaderFileNames(SmallVectorImpl &HeaderFileNames, // Helper function for finding the input file in an arguments list. std::string findInputFile(const CommandLineArguments &CLArgs) { - OwningPtr Opts(createDriverOptTable()); + std::unique_ptr Opts(createDriverOptTable()); const unsigned IncludedFlagsBitmask = options::CC1Option; unsigned MissingArgIndex, MissingArgCount; SmallVector Argv; @@ -298,7 +297,7 @@ std::string findInputFile(const CommandLineArguments &CLArgs) { E = CLArgs.end(); I != E; ++I) Argv.push_back(I->c_str()); - OwningPtr Args( + std::unique_ptr Args( Opts->ParseArgs(Argv.data(), Argv.data() + Argv.size(), MissingArgIndex, MissingArgCount, IncludedFlagsBitmask)); std::vector Inputs = Args->getAllArgValues(OPT_INPUT); @@ -725,12 +724,12 @@ int main(int Argc, const char **Argv) { // Create the compilation database. SmallString<256> PathBuf; sys::fs::current_path(PathBuf); - OwningPtr Compilations; + std::unique_ptr Compilations; Compilations.reset( new FixedCompilationDatabase(Twine(PathBuf), CC1Arguments)); // Create preprocessor tracker, to watch for macro and conditional problems. - OwningPtr PPTracker(PreprocessorTracker::create()); + std::unique_ptr PPTracker(PreprocessorTracker::create()); // Parse all of the headers, detecting duplicates. EntityMap Entities; diff --git a/clang-tools-extra/modularize/ModuleAssistant.cpp b/clang-tools-extra/modularize/ModuleAssistant.cpp index 5be7f320e95..384ac1b807c 100644 --- a/clang-tools-extra/modularize/ModuleAssistant.cpp +++ b/clang-tools-extra/modularize/ModuleAssistant.cpp @@ -30,7 +30,6 @@ //===---------------------------------------------------------------------===// #include "Modularize.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" @@ -281,7 +280,7 @@ bool createModuleMap(llvm::StringRef ModuleMapPath, DependencyMap &Dependencies, llvm::StringRef HeaderPrefix, llvm::StringRef RootModuleName) { // Load internal representation of modules. - llvm::OwningPtr RootModule(loadModuleDescriptions( + std::unique_ptr RootModule(loadModuleDescriptions( RootModuleName, HeaderFileNames, Dependencies, HeaderPrefix)); if (!RootModule.get()) return false; diff --git a/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp b/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp index 2ac752562a9..a0f8c99ef87 100644 --- a/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp +++ b/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp @@ -126,8 +126,9 @@ int main(int Argc, const char **Argv) { cl::ParseCommandLineOptions(Argc, Argv, "module-map-checker.\n"); // Create checker object. - OwningPtr Checker(ModuleMapChecker::createModuleMapChecker( - ModuleMapPath, IncludePaths, DumpModuleMap, CC1Arguments)); + std::unique_ptr Checker( + ModuleMapChecker::createModuleMapChecker(ModuleMapPath, IncludePaths, + DumpModuleMap, CC1Arguments)); // Do the checks. The return value is the program return code, // 0 for okay, 1 for module map warnings produced, 2 for any other error. @@ -394,7 +395,7 @@ ModuleMapChecker::collectUmbrellaHeaderHeaders(StringRef UmbrellaHeaderName) { sys::fs::current_path(PathBuf); // Create the compilation database. - OwningPtr Compilations; + std::unique_ptr Compilations; Compilations.reset(new FixedCompilationDatabase(Twine(PathBuf), CommandLine)); std::vector HeaderPath; diff --git a/clang-tools-extra/module-map-checker/ModuleMapChecker.h b/clang-tools-extra/module-map-checker/ModuleMapChecker.h index 5fa92da22a6..ee23c484eb0 100644 --- a/clang-tools-extra/module-map-checker/ModuleMapChecker.h +++ b/clang-tools-extra/module-map-checker/ModuleMapChecker.h @@ -25,7 +25,6 @@ #include "clang/Lex/HeaderSearchOptions.h" #include "clang/Lex/ModuleMap.h" #include "clang/Lex/Preprocessor.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/StringSet.h" #include "llvm/Support/Host.h" #include @@ -82,9 +81,9 @@ class ModuleMapChecker { /// Options controlling the \#include directive. llvm::IntrusiveRefCntPtr HeaderSearchOpts; /// Header search manager. - llvm::OwningPtr HeaderInfo; + std::unique_ptr HeaderInfo; /// The module map. - llvm::OwningPtr ModMap; + std::unique_ptr ModMap; // Internal data. diff --git a/clang-tools-extra/pp-trace/PPTrace.cpp b/clang-tools-extra/pp-trace/PPTrace.cpp index 9c20ac229e7..fc14db71f21 100644 --- a/clang-tools-extra/pp-trace/PPTrace.cpp +++ b/clang-tools-extra/pp-trace/PPTrace.cpp @@ -57,7 +57,6 @@ #include "clang/Lex/Preprocessor.h" #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/Tooling.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/Config/config.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" @@ -192,7 +191,7 @@ int main(int Argc, const char **Argv) { // Create the compilation database. SmallString<256> PathBuf; sys::fs::current_path(PathBuf); - OwningPtr Compilations; + std::unique_ptr Compilations; Compilations.reset( new FixedCompilationDatabase(Twine(PathBuf), CC1Arguments)); diff --git a/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp b/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp index 0fd0136c94d..21ccc5ba1d1 100644 --- a/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp +++ b/clang-tools-extra/remove-cstr-calls/RemoveCStrCalls.cpp @@ -42,7 +42,6 @@ #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/Refactoring.h" #include "clang/Tooling/Tooling.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/MemoryBuffer.h" @@ -179,8 +178,8 @@ cl::list SourcePaths( int main(int argc, const char **argv) { llvm::sys::PrintStackTraceOnErrorSignal(); - llvm::OwningPtr Compilations( - tooling::FixedCompilationDatabase::loadFromCommandLine(argc, argv)); + std::unique_ptr Compilations( + tooling::FixedCompilationDatabase::loadFromCommandLine(argc, argv)); cl::ParseCommandLineOptions(argc, argv); if (!Compilations) { std::string ErrorMessage; diff --git a/clang-tools-extra/tool-template/ToolTemplate.cpp b/clang-tools-extra/tool-template/ToolTemplate.cpp index 5c4159cce78..7be964f9783 100644 --- a/clang-tools-extra/tool-template/ToolTemplate.cpp +++ b/clang-tools-extra/tool-template/ToolTemplate.cpp @@ -42,7 +42,6 @@ #include "clang/Tooling/CompilationDatabase.h" #include "clang/Tooling/Refactoring.h" #include "clang/Tooling/Tooling.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Signals.h" @@ -81,8 +80,8 @@ cl::list SourcePaths( int main(int argc, const char **argv) { llvm::sys::PrintStackTraceOnErrorSignal(); - llvm::OwningPtr Compilations( - FixedCompilationDatabase::loadFromCommandLine(argc, argv)); + std::unique_ptr Compilations( + FixedCompilationDatabase::loadFromCommandLine(argc, argv)); cl::ParseCommandLineOptions(argc, argv); if (!Compilations) { // Couldn't find a compilation DB from the command line std::string ErrorMessage; diff --git a/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp b/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp index 94b3d866f92..f01c7492da1 100644 --- a/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp +++ b/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp @@ -105,7 +105,7 @@ private: StringRef Include; VirtualFileHelper VFHelper; tooling::Replacements &Replaces; - OwningPtr FileIncludes; + std::unique_ptr FileIncludes; std::string FileToModify; // if non-null, add the include directives in this file instead of the main // file. diff --git a/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp b/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp index 266743ddf70..f79bedeb537 100644 --- a/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp +++ b/clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp @@ -25,10 +25,10 @@ using namespace clang::query; using namespace clang::tooling; TEST(Query, Basic) { - OwningPtr FooAST( + std::unique_ptr FooAST( buildASTFromCode("void foo1(void) {}\nvoid foo2(void) {}", "foo.cc")); ASSERT_TRUE(FooAST.get()); - OwningPtr BarAST( + std::unique_ptr BarAST( buildASTFromCode("void bar1(void) {}\nvoid bar2(void) {}", "bar.cc")); ASSERT_TRUE(BarAST.get()); diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h index 71201dbdddd..f42a57649d1 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h @@ -50,7 +50,7 @@ template std::string runCheckOnCode(StringRef Code) { return ""; ast_matchers::MatchFinder Finder; Check.registerMatchers(&Finder); - OwningPtr Factory( + std::unique_ptr Factory( tooling::newFrontendActionFactory(&Finder)); if (!tooling::runToolOnCode(Factory->create(), Code)) return ""; diff --git a/clang-tools-extra/unittests/include/common/VirtualFileHelper.h b/clang-tools-extra/unittests/include/common/VirtualFileHelper.h index 2960c72ab0d..4ec00da9ced 100644 --- a/clang-tools-extra/unittests/include/common/VirtualFileHelper.h +++ b/clang-tools-extra/unittests/include/common/VirtualFileHelper.h @@ -73,7 +73,7 @@ private: FileManager Files; // most tests don't need more than one file llvm::SmallVector VirtualFiles; - llvm::OwningPtr Sources; + std::unique_ptr Sources; }; } // end namespace clang -- cgit v1.2.1