Changeset 23231 in vbox for trunk/src/VBox

Timestamp:

Sep 22, 2009 4:58:08 PM (15 years ago)

Author:

vboxsync

Message:

merge: solaris build fix

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1558 +1558 @@
                                         hostDVDDriveObj.createObject();
                                         hostDVDDriveObj->init(mParent, DeviceType_DVD,
-                                                              Bstr(devNode), description);
+                                                              Bstr(devNode), Bstr(description));
                                         list.push_back (hostDVDDriveObj);
                                     }
@@ -1720 +1720 @@
                                         ComObjPtr<Medium> hostFloppyDrive;
                                         hostFloppyDrive.createObject();
-                                        hostDVDDriveObj->init(mParent, DeviceType_DVD,
-                                                              Bstr(devNode), description);
+                                        hostFloppyDrive->init(mParent, DeviceType_DVD,
+                                                              Bstr(devNode), Bstr(description));
                                         list.push_back (hostFloppyDrive);
                                     }
@@ -1734 +1734 @@
                                         ComObjPtr<Medium> hostFloppyDrive;
                                         hostFloppyDrive.createObject();
-                                        hostDVDDriveObj->init(mParent, DeviceType_DVD,
+                                        hostFloppyDrive->init(mParent, DeviceType_DVD,
                                                               Bstr(devNode));
                                         list.push_back (hostFloppyDrive);
@@ -1800 +1800 @@
 #endif  /* RT_OS_SOLARIS and VBOX_USE_HAL */
 
+/** @todo get rid of dead code below - RT_OS_SOLARIS and RT_OS_LINUX are never both set
 #if defined(RT_OS_SOLARIS)
 
@@ -1857 +1858 @@
                     ComObjPtr<Medium> hostDVDDriveObj;
                     hostDVDDriveObj.createObject();
-                    hostDVDDriveObj->init (Bstr (mnt_dev));
+                    hostDVDDriveObj->init(mParent, DeviceType_DVD, Bstr(mnt_dev));
                     list.push_back (hostDVDDriveObj);
                 }
@@ -1889 +1890 @@
                     ComObjPtr<Medium> hostDVDDriveObj;
                     hostDVDDriveObj.createObject();
-                    hostDVDDriveObj->init (Bstr (rawDevName));
+                    hostDVDDriveObj->init(mParent, DeviceType_DVD, Bstr(rawDevName));
                     list.push_back (hostDVDDriveObj);
                 }