Changeset 21404 in vbox for trunk/include/iprt

Timestamp:

Jul 8, 2009 3:19:42 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49780

Message:

IPRT, Main: make ministring throw std::bad_alloc on allocation failure; remove isEmpty() and isNull(), change Main code to using length() instead; second try

File:

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

trunk/include/iprt/ministring_cpp.h

@@ -35 +35 @@
 #include <iprt/string.h>
 
+#include <new>
+
 /**
  *  "ministring" is a small C++ string class that does not depend on anything
@@ -125 +127 @@
         {
             m_psz = (char*)RTMemRealloc(m_psz, cb);
+#ifdef RT_EXCEPTIONS_ENABLED
+            if (!m_psz)
+                throw std::bad_alloc();
+#endif
             m_cbAllocated = cb;
         }
@@ -255 +261 @@
     {
         return length() == 0;
-    }
-
-    /**
-     * Returns true if no memory is currently allocated.
-     * @return
-     */
-    bool isNull() const
-    {
-        return m_psz == NULL;
     }
 
@@ -349 +346 @@
             m_cbAllocated = m_cbLength + 1;
             m_psz = (char*)RTMemAlloc(m_cbAllocated);
+#ifdef RT_EXCEPTIONS_ENABLED
+            if (!m_psz)
+                throw std::bad_alloc();
+#endif
             memcpy(m_psz, s.m_psz, m_cbAllocated);      // include 0 terminator
         }
@@ -374 +375 @@
             m_cbAllocated = m_cbLength + 1;
             m_psz = (char*)RTMemAlloc(m_cbAllocated);
+#ifdef RT_EXCEPTIONS_ENABLED
+            if (!m_psz)
+                throw std::bad_alloc();
+#endif
             memcpy(m_psz, pcsz, m_cbAllocated);      // include 0 terminator
         }