Changeset 47369 in vbox

Timestamp:

Jul 24, 2013 12:35:14 PM (11 years ago)

Author:

vboxsync

Message:

Reverted r87514 + r87515: Not needed since -fexceptions is not specified atm.

File:

• trunk/include/VBox/com/ptr.h (modified) (2 diffs)

trunk/include/VBox/com/ptr.h

@@ -42 +42 @@
 #else
  #include <nsISupportsUtils.h>
+
 #endif /* !defined (VBOX_WITH_XPCOM) */
 
-#include <new> /* For bad_alloc. */
 #include <VBox/com/defs.h>
 
@@ -463 +463 @@
     HRESULT createObject()
     {
-        HRESULT hr;
-        try
+        HRESULT rc;
+#if !defined (VBOX_WITH_XPCOM)
+#   ifdef VBOX_COM_OUTOFPROC_MODULE
+        CComObjectNoLock<T> *obj = new CComObjectNoLock<T>();
+        if (obj)
         {
-#if !defined (VBOX_WITH_XPCOM)
-# ifdef VBOX_COM_OUTOFPROC_MODULE
-            CComObjectNoLock<T> *obj = new CComObjectNoLock<T>();
             obj->InternalFinalConstructAddRef();
-            hr = obj->FinalConstruct();
+            rc = obj->FinalConstruct();
             obj->InternalFinalConstructRelease();
-# else
-            CComObject<T> *obj = NULL;
-            hr = CComObject<T>::CreateInstance(&obj);
-# endif
+        }
+        else
+            rc = E_OUTOFMEMORY;
+#   else
+        CComObject<T> *obj = NULL;
+        rc = CComObject<T>::CreateInstance(&obj);
+#   endif
 #else /* !defined (VBOX_WITH_XPCOM) */
-            CComObject<T> *obj = new CComObject<T>();
-            hr = obj->FinalConstruct();
+        CComObject<T> *obj = new CComObject<T>();
+        if (obj)
+            rc = obj->FinalConstruct();
+        else
+            rc = E_OUTOFMEMORY;
 #endif /* !defined (VBOX_WITH_XPCOM) */
-            *this = obj;
-        }
-        catch(std::bad_alloc &)
-        {
-            hr = E_OUTOFMEMORY;
-        }
-
-        return hr;
+        *this = obj;
+        return rc;
     }
 };