Changeset 23223 in vbox for trunk/include/VBox/com/VirtualBoxErrorInfo.h

Timestamp:

Sep 22, 2009 3:50:03 PM (15 years ago)

Author:

vboxsync

Message:

API: big medium handling change and lots of assorted other cleanups and fixes

File:

• trunk/include/VBox/com/VirtualBoxErrorInfo.h (modified) (5 diffs)

trunk/include/VBox/com/VirtualBoxErrorInfo.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56 +56 @@
  */
 class ATL_NO_VTABLE VirtualBoxErrorInfo
-#if !defined (VBOX_WITH_XPCOM)
     : public CComObjectRootEx <CComMultiThreadModel>
-#else
-    : public CComObjectRootEx
-#endif
     , public IVirtualBoxErrorInfo
 {
@@ -73 +69 @@
         COM_INTERFACE_ENTRY (IVirtualBoxErrorInfo)
     END_COM_MAP()
-
-    NS_DECL_ISUPPORTS
 
     VirtualBoxErrorInfo() : mResultCode (S_OK) {}
@@ -127 +121 @@
  */
 class ATL_NO_VTABLE VirtualBoxErrorInfoGlue
-#if !defined (VBOX_WITH_XPCOM)
     : public CComObjectRootEx <CComMultiThreadModel>
-#else
-    : public CComObjectRootEx
-#endif
     , public IVirtualBoxErrorInfo
 {
@@ -144 +134 @@
         COM_INTERFACE_ENTRY (IVirtualBoxErrorInfo)
     END_COM_MAP()
-
-    NS_DECL_ISUPPORTS
 
     VirtualBoxErrorInfoGlue() {}