Changeset 36529 in vbox for trunk/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp

Timestamp:

Apr 4, 2011 1:54:13 PM (14 years ago)

Author:

vboxsync

Message:

iprt::non_copyable -> RTCNonCopyable (now in utils.h), moved and renamed RTMemAutoPtr et al out of iprt/mem.h.

File:

• trunk/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp (modified) (14 diffs)

trunk/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Testcase the RTMemAutoPtr template.
+ * IPRT - Testcase the RTCMemAutoPtr template.
  */
 
@@ -28 +28 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/mem.h>
+#include <iprt/cpp/mem.h>
 #include <iprt/stream.h>
 #include <iprt/initterm.h>
@@ -61 +61 @@
 extern "C" int tstMemAutoPtrDisas1(void **ppv)
 {
-    RTMemAutoPtr<TSTMEMAUTOPTRSTRUCT> Handle(1);
+    RTCMemAutoPtr<TSTMEMAUTOPTRSTRUCT> Handle(1);
     if (!Handle)
     {
@@ -135 +135 @@
      */
     {
-        RTMemAutoPtr<char> NilObj;
+        RTCMemAutoPtr<char> NilObj;
         CHECK_EXPR(!NilObj);
         CHECK_EXPR(NilObj.get() == NULL);
@@ -143 +143 @@
 
     {
-        RTMemAutoPtr<char> Alloc(10);
+        RTCMemAutoPtr<char> Alloc(10);
         CHECK_EXPR(Alloc.get() != NULL);
         char *pch = Alloc.release();
@@ -149 +149 @@
         CHECK_EXPR(Alloc.get() == NULL);
 
-        RTMemAutoPtr<char> Manage(pch);
+        RTCMemAutoPtr<char> Manage(pch);
         CHECK_EXPR(Manage.get() == pch);
         CHECK_EXPR(&Manage[0] == pch);
@@ -161 +161 @@
      */
     {
-        RTMemAutoPtr<char, RTMemEfAutoFree<char>, RTMemEfReallocNP> Electric(10);
+        RTCMemAutoPtr<char, RTCMemEfAutoFree<char>, RTMemEfReallocNP> Electric(10);
         CHECK_EXPR(Electric.get() != NULL);
         Electric[0] = '0';
@@ -178 +178 @@
     g_cFrees = 0;
     {
-        RTMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt(128);
+        RTCMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt(128);
         FreeIt[127] = '0';
     }
@@ -185 +185 @@
     g_cFrees = 0;
     {
-        RTMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt2(128);
+        RTCMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt2(128);
         FreeIt2[127] = '1';
         FreeIt2.reset();
@@ -196 +196 @@
     g_cFrees = 0;
     {
-        RTMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> DontFreeIt(256);
+        RTCMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> DontFreeIt(256);
         DontFreeIt[255] = '0';
         RTMemEfFreeNP(DontFreeIt.release());
@@ -204 +204 @@
     g_cFrees = 0;
     {
-        RTMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt3(128);
+        RTCMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt3(128);
         FreeIt3[127] = '0';
         CHECK_EXPR(FreeIt3.realloc(128));
@@ -219 +219 @@
     g_cFrees = 0;
     {
-        RTMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt4;
+        RTCMemAutoPtr<char, tstMemAutoPtrDestructorCounter, RTMemEfReallocNP> FreeIt4;
         CHECK_EXPR(FreeIt4.alloc(123));
         CHECK_EXPR(FreeIt4.realloc(543));
@@ -231 +231 @@
      */
     {
-        RTMemAutoPtr<TSTMEMAUTOPTRSTRUCT> Struct1(1);
+        RTCMemAutoPtr<TSTMEMAUTOPTRSTRUCT> Struct1(1);
         Struct1->a = 0x11223344;
         Struct1->b = 0x55667788;
@@ -266 +266 @@
      */
     {
-        RTMemAutoPtr<uint64_t, RTMemAutoDestructor<uint64_t>, tstMemAutoPtrAllocatorNoZero> Zeroed1(1, true);
+        RTCMemAutoPtr<uint64_t, RTCMemAutoDestructor<uint64_t>, tstMemAutoPtrAllocatorNoZero> Zeroed1(1, true);
         CHECK_EXPR(*Zeroed1 == 0);
     }
 
     {
-        RTMemAutoPtr<uint64_t, RTMemAutoDestructor<uint64_t>, tstMemAutoPtrAllocatorNoZero> Zeroed2;
+        RTCMemAutoPtr<uint64_t, RTCMemAutoDestructor<uint64_t>, tstMemAutoPtrAllocatorNoZero> Zeroed2;
         Zeroed2.alloc(5, true);
         CHECK_EXPR(Zeroed2[0] == 0);