Changeset 37587 in vbox

Timestamp:

Jun 22, 2011 12:02:13 PM (13 years ago)

Author:

vboxsync

Message:

vcc build fix

Location:

trunk/src/VBox/Main

Files:

• include/MediumFormatImpl.h (modified) (1 diff)
• src-server/MediumFormatImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/MediumFormatImpl.h

@@ -59 +59 @@
     struct Data
     {
-        Data() : capabilities(0) {}
+        Data() : capabilities((MediumFormatCapabilities_T)0) {}
 
         const Utf8Str        strId;

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

@@ -67 +67 @@
     unconst(m.strName) = aVDInfo->pszBackend;
     /* The capabilities of the backend. Assumes 1:1 mapping! */
-    unconst(m.capabilities) = aVDInfo->uBackendCaps;
+    unconst(m.capabilities) = (MediumFormatCapabilities_T)aVDInfo->uBackendCaps;
     /* Save the supported file extensions in a list */
     if (aVDInfo->paFileExtensions)
@@ -184 +184 @@
     unconst(m.llFileExtensions).clear();
     unconst(m.llDeviceTypes).clear();
-    unconst(m.capabilities) = 0;
+    unconst(m.capabilities) = (MediumFormatCapabilities_T)0;
     unconst(m.strName).setNull();
     unconst(m.strId).setNull();
@@ -230 +230 @@
     /// limit (or make the argument ULONG64 after checking that COM is capable
     /// of defining enums (used to represent bit flags) that contain 64-bit
-    /// values)
-    ComAssertRet(m.capabilities == ((ULONG)m.capabilities), E_FAIL);
-
-    *aCaps = (ULONG) m.capabilities;
+    /// values). Or go away from the enum/ulong hack for bit sets and use
+    /// a safearray like elsewhere.
+    ComAssertRet((uint64_t)m.capabilities == ((ULONG)m.capabilities), E_FAIL);
+
+    *aCaps = (ULONG)m.capabilities;
 
     return S_OK;