commit 9a16beb8bc580212df519aa488242a94e53741d8
author Ahmed Charles <ahmedcharles@gmail.com> Fri Mar 07 19:33:25 2014 +0000
committer Ahmed Charles <ahmedcharles@gmail.com> Fri Mar 07 19:33:25 2014 +0000
tree 569f8fb251291e9aaacc0ddb6d509a9561ddc264
parent 9cbd3c628cfdcb7ba2f372b57db317df2a271ebb

Change OwningPtr::take() to OwningPtr::release().

This is a precursor to moving to std::unique_ptr.

llvm-svn: 203275

clang/lib/Tooling/JSONCompilationDatabase.cpp

diff --git a/clang/lib/Tooling/JSONCompilationDatabase.cpp b/clang/lib/Tooling/JSONCompilationDatabase.cpp
index dad4600..232c329 100644
--- a/clang/lib/Tooling/JSONCompilationDatabase.cpp
+++ b/clang/lib/Tooling/JSONCompilationDatabase.cpp
@@ -126,7 +126,7 @@
         JSONCompilationDatabase::loadFromFile(JSONDatabasePath, ErrorMessage));
     if (!Database)
       return NULL;
-    return Database.take();
+    return Database.release();
   }
 };
 
@@ -152,10 +152,10 @@
     return NULL;
   }
   OwningPtr<JSONCompilationDatabase> Database(
-    new JSONCompilationDatabase(DatabaseBuffer.take()));
+      new JSONCompilationDatabase(DatabaseBuffer.release()));
   if (!Database->parse(ErrorMessage))
     return NULL;
-  return Database.take();
+  return Database.release();
 }
 
 JSONCompilationDatabase *
@@ -164,10 +164,10 @@
   OwningPtr<llvm::MemoryBuffer> DatabaseBuffer(
       llvm::MemoryBuffer::getMemBuffer(DatabaseString));
   OwningPtr<JSONCompilationDatabase> Database(
-      new JSONCompilationDatabase(DatabaseBuffer.take()));
+      new JSONCompilationDatabase(DatabaseBuffer.release()));
   if (!Database->parse(ErrorMessage))
     return NULL;
-  return Database.take();
+  return Database.release();
 }
 
 std::vector<CompileCommand>

clang/lib/Tooling/Tooling.cpp

diff --git a/clang/lib/Tooling/Tooling.cpp b/clang/lib/Tooling/Tooling.cpp
index ee110e3..9783ed0 100644
--- a/clang/lib/Tooling/Tooling.cpp
+++ b/clang/lib/Tooling/Tooling.cpp
@@ -228,7 +228,7 @@
         llvm::MemoryBuffer::getMemBuffer(It->getValue());
     Invocation->getPreprocessorOpts().addRemappedFile(It->getKey(), Input);
   }
-  return runInvocation(BinaryName, Compilation.get(), Invocation.take());
+  return runInvocation(BinaryName, Compilation.get(), Invocation.release());
 }
 
 bool ToolInvocation::runInvocation(