diff options
author | Ahmed Charles <ahmedcharles@gmail.com> | 2014-03-07 20:03:18 +0000 |
---|---|---|
committer | Ahmed Charles <ahmedcharles@gmail.com> | 2014-03-07 20:03:18 +0000 |
commit | b89843299a118d9f97774f35e59f9b541ef5e284 (patch) | |
tree | ee6366d2f652d2475d52f6ea9b4fbbc64dc2647e /clang/lib/Tooling/CompilationDatabase.cpp | |
parent | 629afaefe0cd1a583ccee54918b7b13f48bfe273 (diff) | |
download | bcm5719-llvm-b89843299a118d9f97774f35e59f9b541ef5e284.tar.gz bcm5719-llvm-b89843299a118d9f97774f35e59f9b541ef5e284.zip |
Replace OwningPtr with std::unique_ptr.
This compiles cleanly with lldb/lld/clang-tools-extra/llvm.
llvm-svn: 203279
Diffstat (limited to 'clang/lib/Tooling/CompilationDatabase.cpp')
-rw-r--r-- | clang/lib/Tooling/CompilationDatabase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Tooling/CompilationDatabase.cpp b/clang/lib/Tooling/CompilationDatabase.cpp index 76c006f389d..57424e37e93 100644 --- a/clang/lib/Tooling/CompilationDatabase.cpp +++ b/clang/lib/Tooling/CompilationDatabase.cpp @@ -43,7 +43,7 @@ CompilationDatabase::loadFromDirectory(StringRef BuildDirectory, Ie = CompilationDatabasePluginRegistry::end(); It != Ie; ++It) { std::string DatabaseErrorMessage; - OwningPtr<CompilationDatabasePlugin> Plugin(It->instantiate()); + std::unique_ptr<CompilationDatabasePlugin> Plugin(It->instantiate()); if (CompilationDatabase *DB = Plugin->loadFromDirectory(BuildDirectory, DatabaseErrorMessage)) return DB; @@ -213,7 +213,7 @@ static bool stripPositionalArgs(std::vector<const char *> Args, // Neither clang executable nor default image name are required since the // jobs the driver builds will not be executed. - OwningPtr<driver::Driver> NewDriver(new driver::Driver( + std::unique_ptr<driver::Driver> NewDriver(new driver::Driver( /* ClangExecutable= */ "", llvm::sys::getDefaultTargetTriple(), /* DefaultImageName= */ "", Diagnostics)); NewDriver->setCheckInputsExist(false); @@ -241,7 +241,7 @@ static bool stripPositionalArgs(std::vector<const char *> Args, std::remove_if(Args.begin(), Args.end(), MatchesAny(std::string("-no-integrated-as"))); - const OwningPtr<driver::Compilation> Compilation( + const std::unique_ptr<driver::Compilation> Compilation( NewDriver->BuildCompilation(Args)); const driver::JobList &Jobs = Compilation->getJobs(); |