Changeset 37599 in vbox

Timestamp:

Jun 22, 2011 9:06:38 PM (13 years ago)

Author:

vboxsync

Message:

Main/USBProxyService: implementation inheritance is not so great that we have to pretend to do it when we are not

Location:

trunk/src/VBox/Main/src-server

Files:

trunk/src/VBox/Main/src-server/USBProxyService.cpp

-              r36993
+              r37599
 /**
+ * Initialize the object.
+ *
+ * Child classes should override and call this method
+ *
+ * @returns S_OK on success, or COM error status on fatal error.
+ * Stub needed as long as the class isn't virtual
  */
 HRESULT USBProxyService::init(void)

-              r31892
+              r37599
 HRESULT USBProxyServiceDarwin::init(void)
+{
-    /*
-     * Call the superclass method first.
-     */
-    HRESULT hrc = USBProxyService::init();
-    AssertComRCReturn(hrc, hrc);
 #ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     /*

-              r34014
+              r37599
 HRESULT USBProxyServiceFreeBSD::init(void)
+{
-    /*
-     * Call the superclass method first.
-     */
-    HRESULT hrc = USBProxyService::init();
-    AssertComRCReturn(hrc, hrc);
     /*
      * Create semaphore.

-              r37596
+              r37599
+{
     /*
-     * Call the superclass method first.
-     */
-    HRESULT hrc = USBProxyService::init();
-    AssertComRCReturn(hrc, hrc);
-    /*
      * We have two methods available for getting host USB device data - using
      * USBFS and using sysfs.  The default choice is sysfs; if that is not

-              r33540
+              r37599
 HRESULT USBProxyServiceSolaris::init(void)
+{
-    /*
-     * Call the superclass method first.
-     */
-    HRESULT hrc = USBProxyService::init();
-    AssertComRCReturn(hrc, hrc);
     /*
      * Create semaphore.

-              r36941
+              r37599
+{
     /*
-     * Call the superclass method first.
-     */
-    HRESULT hrc = USBProxyService::init();
-    AssertComRCReturn(hrc, hrc);
-    /*
      * Create the semaphore (considered fatal).
      */

Note: See TracChangeset for help on using the changeset viewer.