[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. git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@203382 91177308-0d34-0410-b5e6-96231b3b80d8
brevzin · Mar 9, 2014 · c1d88b9 · c1d88b9
1 parent 7a14b6d
commit c1d88b9
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 44 deletions.
diff --git a/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp b/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
@@ -59,7 +59,7 @@ collectReplacementsFromDirectory(const llvm::StringRef Directory,
 
     TURFiles.push_back(I->path());
 
-    OwningPtr<MemoryBuffer> Out;
+    std::unique_ptr<MemoryBuffer> Out;
     error_code BufferError = MemoryBuffer::getFile(I->path(), Out);
     if (BufferError) {
       errs() << "Error reading " << I->path() << ": " << BufferError.message()

diff --git a/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/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<ScopedFileRemover> Remover;
+  std::unique_ptr<ScopedFileRemover> Remover;
   if (RemoveTUReplacementFiles)
     Remover.reset(new ScopedFileRemover(TURFiles, Diagnostics));
 

diff --git a/clang-modernize/Core/IncludeExcludeInfo.cpp b/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<MemoryBuffer> FileBuf;
+    std::unique_ptr<MemoryBuffer> 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<MemoryBuffer> FileBuf;
+    std::unique_ptr<MemoryBuffer> FileBuf;
     if (error_code Err = MemoryBuffer::getFile(ExcludeListFile, FileBuf)) {
       errs() << "Unable to read from exclude file.\n";
       return Err;

diff --git a/clang-modernize/Core/Transform.h b/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-modernize/Core/Transforms.cpp b/clang-modernize/Core/Transforms.cpp
@@ -61,7 +61,7 @@ Transforms::createSelectedTransforms(const TransformOptions &GlobalOptions,
     if (!OptionEnabled)
       continue;
 
-    llvm::OwningPtr<TransformFactory> Factory(I->instantiate());
+    std::unique_ptr<TransformFactory> Factory(I->instantiate());
     if (Factory->supportsCompilers(RequiredVersions))
       ChosenTransforms.push_back(Factory->createTransform(GlobalOptions));
     else if (ExplicitlyEnabled)

diff --git a/clang-modernize/LoopConvert/LoopActions.h b/clang-modernize/LoopConvert/LoopActions.h
@@ -53,7 +53,7 @@ struct TUTrackingInfo {
   /// \}
 
 private:
-  llvm::OwningPtr<StmtAncestorASTVisitor> ParentFinder;
+  std::unique_ptr<StmtAncestorASTVisitor> ParentFinder;
   StmtGeneratedVarNameMap GeneratedDecls;
   ReplacedVarsMap ReplacedVars;
 };

diff --git a/clang-modernize/LoopConvert/LoopConvert.h b/clang-modernize/LoopConvert/LoopConvert.h
@@ -37,7 +37,7 @@ class LoopConvertTransform : public Transform {
   virtual bool handleBeginSource(clang::CompilerInstance &CI,
                                  llvm::StringRef Filename) override;
 private:
-  llvm::OwningPtr<TUTrackingInfo> TUInfo;
+  std::unique_ptr<TUTrackingInfo> TUInfo;
 };
 
 #endif // CLANG_MODERNIZE_LOOP_CONVERT_H
diff --git a/clang-modernize/PassByValue/PassByValue.h b/clang-modernize/PassByValue/PassByValue.h
@@ -66,7 +66,7 @@ class PassByValueTransform : public Transform {
   virtual bool handleBeginSource(clang::CompilerInstance &CI,
                                  llvm::StringRef Filename) override;
 
-  llvm::OwningPtr<IncludeDirectives> IncludeManager;
+  std::unique_ptr<IncludeDirectives> IncludeManager;
   ConstructorParamReplacer *Replacer;
 };
 

diff --git a/clang-modernize/tool/ClangModernize.cpp b/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<CompilationDatabase> Compilations(
+  std::unique_ptr<CompilationDatabase> Compilations(
       FixedCompilationDatabase::loadFromCommandLine(argc, argv));
   cl::ParseCommandLineOptions(argc, argv);
 

diff --git a/clang-query/tool/ClangQuery.cpp b/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<CompilationDatabase> Compilations(
-        FixedCompilationDatabase::loadFromCommandLine(argc, argv));
+  std::unique_ptr<CompilationDatabase> 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-tidy/ClangTidy.cpp b/clang-tidy/ClangTidy.cpp
@@ -100,7 +100,7 @@ ClangTidyASTConsumerFactory::ClangTidyASTConsumerFactory(
   for (ClangTidyModuleRegistry::iterator I = ClangTidyModuleRegistry::begin(),
                                          E = ClangTidyModuleRegistry::end();
        I != E; ++I) {
-    OwningPtr<ClangTidyModule> Module(I->instantiate());
+    std::unique_ptr<ClangTidyModule> Module(I->instantiate());
     Module->addCheckFactories(*CheckFactories);
   }
 

diff --git a/clang-tidy/ClangTidy.h b/clang-tidy/ClangTidy.h
@@ -124,7 +124,7 @@ class ClangTidyASTConsumerFactory {
   SmallVector<ClangTidyCheck *, 8> Checks;
   ClangTidyContext &Context;
   ast_matchers::MatchFinder Finder;
-  OwningPtr<ClangTidyCheckFactories> CheckFactories;
+  std::unique_ptr<ClangTidyCheckFactories> CheckFactories;
 };
 
 /// \brief Fills the list of check names that are enabled when the provided

diff --git a/clang-tidy/ClangTidyDiagnosticConsumer.h b/clang-tidy/ClangTidyDiagnosticConsumer.h
@@ -128,7 +128,7 @@ class ClangTidyDiagnosticConsumer : public DiagnosticConsumer {
   void finalizeLastError();
 
   ClangTidyContext &Context;
-  OwningPtr<DiagnosticsEngine> Diags;
+  std::unique_ptr<DiagnosticsEngine> Diags;
   SmallVector<ClangTidyError, 8> Errors;
   bool LastErrorRelatesToUserCode;
 };

diff --git a/modularize/Modularize.cpp b/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<std::string> &HeaderFileNames,
     HeaderDirectory = HeaderPrefix;
 
   // Read the header list file into a buffer.
-  OwningPtr<MemoryBuffer> listBuffer;
+  std::unique_ptr<MemoryBuffer> listBuffer;
   if (error_code ec = MemoryBuffer::getFile(ListFileName, listBuffer)) {
     return ec;
   }
@@ -290,15 +289,15 @@ error_code getHeaderFileNames(SmallVectorImpl<std::string> &HeaderFileNames,
 
 // Helper function for finding the input file in an arguments list.
 std::string findInputFile(const CommandLineArguments &CLArgs) {
-  OwningPtr<OptTable> Opts(createDriverOptTable());
+  std::unique_ptr<OptTable> Opts(createDriverOptTable());
   const unsigned IncludedFlagsBitmask = options::CC1Option;
   unsigned MissingArgIndex, MissingArgCount;
   SmallVector<const char *, 256> Argv;
   for (CommandLineArguments::const_iterator I = CLArgs.begin(),
                                             E = CLArgs.end();
        I != E; ++I)
     Argv.push_back(I->c_str());
-  OwningPtr<InputArgList> Args(
+  std::unique_ptr<InputArgList> Args(
       Opts->ParseArgs(Argv.data(), Argv.data() + Argv.size(), MissingArgIndex,
                       MissingArgCount, IncludedFlagsBitmask));
   std::vector<std::string> 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<CompilationDatabase> Compilations;
+  std::unique_ptr<CompilationDatabase> Compilations;
   Compilations.reset(
       new FixedCompilationDatabase(Twine(PathBuf), CC1Arguments));
 
   // Create preprocessor tracker, to watch for macro and conditional problems.
-  OwningPtr<PreprocessorTracker> PPTracker(PreprocessorTracker::create());
+  std::unique_ptr<PreprocessorTracker> PPTracker(PreprocessorTracker::create());
 
   // Parse all of the headers, detecting duplicates.
   EntityMap Entities;

diff --git a/modularize/ModuleAssistant.cpp b/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<Module> RootModule(loadModuleDescriptions(
+  std::unique_ptr<Module> RootModule(loadModuleDescriptions(
       RootModuleName, HeaderFileNames, Dependencies, HeaderPrefix));
   if (!RootModule.get())
     return false;

diff --git a/module-map-checker/ModuleMapChecker.cpp b/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<ModuleMapChecker> Checker(ModuleMapChecker::createModuleMapChecker(
-      ModuleMapPath, IncludePaths, DumpModuleMap, CC1Arguments));
+  std::unique_ptr<ModuleMapChecker> 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<CompilationDatabase> Compilations;
+  std::unique_ptr<CompilationDatabase> Compilations;
   Compilations.reset(new FixedCompilationDatabase(Twine(PathBuf), CommandLine));
 
   std::vector<std::string> HeaderPath;

diff --git a/module-map-checker/ModuleMapChecker.h b/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 <string>
@@ -82,9 +81,9 @@ class ModuleMapChecker {
   /// Options controlling the \#include directive.
   llvm::IntrusiveRefCntPtr<clang::HeaderSearchOptions> HeaderSearchOpts;
   /// Header search manager.
-  llvm::OwningPtr<clang::HeaderSearch> HeaderInfo;
+  std::unique_ptr<clang::HeaderSearch> HeaderInfo;
   /// The module map.
-  llvm::OwningPtr<clang::ModuleMap> ModMap;
+  std::unique_ptr<clang::ModuleMap> ModMap;
 
   // Internal data.
 

diff --git a/pp-trace/PPTrace.cpp b/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<CompilationDatabase> Compilations;
+  std::unique_ptr<CompilationDatabase> Compilations;
   Compilations.reset(
       new FixedCompilationDatabase(Twine(PathBuf), CC1Arguments));
 

diff --git a/remove-cstr-calls/RemoveCStrCalls.cpp b/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<std::string> SourcePaths(
 
 int main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal();
-  llvm::OwningPtr<CompilationDatabase> Compilations(
-    tooling::FixedCompilationDatabase::loadFromCommandLine(argc, argv));
+  std::unique_ptr<CompilationDatabase> Compilations(
+      tooling::FixedCompilationDatabase::loadFromCommandLine(argc, argv));
   cl::ParseCommandLineOptions(argc, argv);
   if (!Compilations) {
     std::string ErrorMessage;

diff --git a/tool-template/ToolTemplate.cpp b/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<std::string> SourcePaths(
 
 int main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal();
-  llvm::OwningPtr<CompilationDatabase> Compilations(
-        FixedCompilationDatabase::loadFromCommandLine(argc, argv));
+  std::unique_ptr<CompilationDatabase> 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/unittests/clang-modernize/IncludeDirectivesTest.cpp b/unittests/clang-modernize/IncludeDirectivesTest.cpp
@@ -105,7 +105,7 @@ class TestAddIncludeAction : public PreprocessOnlyAction {
   StringRef Include;
   VirtualFileHelper VFHelper;
   tooling::Replacements &Replaces;
-  OwningPtr<IncludeDirectives> FileIncludes;
+  std::unique_ptr<IncludeDirectives> FileIncludes;
   std::string FileToModify;
   // if non-null, add the include directives in this file instead of the main
   // file.

diff --git a/unittests/clang-query/QueryEngineTest.cpp b/unittests/clang-query/QueryEngineTest.cpp
@@ -25,10 +25,10 @@ using namespace clang::query;
 using namespace clang::tooling;
 
 TEST(Query, Basic) {
-  OwningPtr<ASTUnit> FooAST(
+  std::unique_ptr<ASTUnit> FooAST(
       buildASTFromCode("void foo1(void) {}\nvoid foo2(void) {}", "foo.cc"));
   ASSERT_TRUE(FooAST.get());
-  OwningPtr<ASTUnit> BarAST(
+  std::unique_ptr<ASTUnit> BarAST(
       buildASTFromCode("void bar1(void) {}\nvoid bar2(void) {}", "bar.cc"));
   ASSERT_TRUE(BarAST.get());
 

diff --git a/unittests/clang-tidy/ClangTidyTest.h b/unittests/clang-tidy/ClangTidyTest.h
@@ -50,7 +50,7 @@ template <typename T> std::string runCheckOnCode(StringRef Code) {
     return "";
   ast_matchers::MatchFinder Finder;
   Check.registerMatchers(&Finder);
-  OwningPtr<tooling::FrontendActionFactory> Factory(
+  std::unique_ptr<tooling::FrontendActionFactory> Factory(
       tooling::newFrontendActionFactory(&Finder));
   if (!tooling::runToolOnCode(Factory->create(), Code))
     return "";

diff --git a/unittests/include/common/VirtualFileHelper.h b/unittests/include/common/VirtualFileHelper.h
@@ -73,7 +73,7 @@ class VirtualFileHelper {
   FileManager Files;
   // most tests don't need more than one file
   llvm::SmallVector<VirtualFile, 1> VirtualFiles;
-  llvm::OwningPtr<SourceManager> Sources;
+  std::unique_ptr<SourceManager> Sources;
 };
 
 } // end namespace clang