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

Ahmed Charles acharles at outlook.com
Tue Mar 4 21:49:56 PST 2014


Hi dblaikie,

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

http://llvm-reviews.chandlerc.com/D2960

Files:
  include/llvm/ADT/OwningPtr.h
  unittests/ADT/OwningPtrTest.cpp

Index: include/llvm/ADT/OwningPtr.h
===================================================================
--- include/llvm/ADT/OwningPtr.h
+++ include/llvm/ADT/OwningPtr.h
@@ -73,6 +73,8 @@
     return Tmp;
   }
 
+  T *release() { return take(); }
+
   std::unique_ptr<T> take_unique() { return std::unique_ptr<T>(take()); }
 
   T &operator*() const {
Index: unittests/ADT/OwningPtrTest.cpp
===================================================================
--- unittests/ADT/OwningPtrTest.cpp
+++ unittests/ADT/OwningPtrTest.cpp
@@ -90,6 +90,24 @@
   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();
   {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D2960.1.patch
Type: text/x-patch
Size: 1150 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140304/4e444de2/attachment.bin>


More information about the llvm-commits mailing list