[C++11] Add release() to OwningPtr.

This will make the transition to unique_ptr easier by allowing more
incremental changes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202949 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/OwningPtr.h b/include/llvm/ADT/OwningPtr.h
index 5453d5c84e47108eac17e89f6e87c48466f75c20..034bcfd6edd5f668bfa493cd4a7dd5f44673e882 100644 (file)
--- a/include/llvm/ADT/OwningPtr.h
+++ b/include/llvm/ADT/OwningPtr.h
@@ -73,6 +73,8 @@ public:
     return Tmp;
   }
 
+  T *release() { return take(); }
+
   std::unique_ptr<T> take_unique() { return std::unique_ptr<T>(take()); }
 
   T &operator*() const {

diff --git a/unittests/ADT/OwningPtrTest.cpp b/unittests/ADT/OwningPtrTest.cpp
index aef4d97bd66d085febbe691297aa3bf0166fdf38..8b10f475d0918d5a85ef6ee764eb54f3bc65003b 100644 (file)
--- a/unittests/ADT/OwningPtrTest.cpp
+++ b/unittests/ADT/OwningPtrTest.cpp
@@ -90,6 +90,24 @@ TEST_F(OwningPtrTest, Take) {
   EXPECT_EQ(1u, TrackDestructor::Destructions);
 }
 
+TEST_F(OwningPtrTest, Release) {
+  TrackDestructor::ResetCounts();
+  TrackDestructor *T = 0;
+  {
+    OwningPtr<TrackDestructor> O(new TrackDestructor(3));
+    T = O.release();
+    EXPECT_FALSE((bool)O);
+    EXPECT_TRUE(!O);
+    EXPECT_FALSE(O.get());
+    EXPECT_FALSE(O.isValid());
+    EXPECT_TRUE(T);
+    EXPECT_EQ(3, T->val);
+    EXPECT_EQ(0u, TrackDestructor::Destructions);
+  }
+  delete T;
+  EXPECT_EQ(1u, TrackDestructor::Destructions);
+}
+
 TEST_F(OwningPtrTest, MoveConstruction) {
   TrackDestructor::ResetCounts();
   {