Changeset 11017 in vbox for trunk/include

Timestamp:

Jul 30, 2008 10:27:27 PM (16 years ago)

Author:

vboxsync

Message:

iprt: Some RTMemAutoPtr optimizations.

File:

• trunk/include/iprt/mem.h (modified) (5 diffs)

trunk/include/iprt/mem.h

@@ -488 +488 @@
 
     /**
-     * Constructor that
+     * Constructor that allocates memory.
      *
      * @param   a_cElements The number of elements (of the data type) to allocate.
@@ -495 +495 @@
      */
     RTMemAutoPtr(size_t a_cElements, bool a_fZeroed = false)
-        : RTAutoRes<T *, Destruct, RTMemAutoNil<T> >((T *)NULL)
-    {
-        alloc(a_cElements, a_fZeroed);
+        : RTAutoRes<T *, Destruct, RTMemAutoNil<T> >((T *)Allocator(NULL, a_cElements * sizeof(T)))
+    {
+        if (a_fZeroed && RT_LIKELY(this->get() != NULL))
+            memset(this->get(), '\0', a_cElements * sizeof(T));
     }
 
@@ -509 +510 @@
         this->RTAutoRes<T *, Destruct, RTMemAutoNil<T> >::operator=(aPtr);
         return *this;
-     }
+    }
 
     /**
@@ -557 +558 @@
         this->reset(NULL);
         T *pNewMem = (T *)Allocator(NULL, a_cElements * sizeof(T));
-        if (a_fZeroed && pNewMem)
+        if (a_fZeroed && RT_LIKELY(pNewMem != NULL))
             memset(pNewMem, '\0', a_cElements * sizeof(T));
         this->reset(pNewMem);
@@ -584 +585 @@
     {
         T *aNewValue = (T *)Allocator(this->get(), a_cElements * sizeof(T));
-        if (aNewValue != NULL)
+        if (RT_LIKELY(aNewValue != NULL))
             this->release();
         /* We want this both if aNewValue is non-NULL and if it is NULL. */