Changeset 73104 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 12, 2018 11:53:10 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123681

Message:

Main: Two clang build fixes (offset-of cleanup).

Location:

trunk/src/VBox/Main/src-client

Files:

• DisplayImpl.cpp (modified) (1 diff)
• DrvAudioVideoRec.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -3424 +3424 @@
         return VERR_INVALID_STATE;
 
-    size_t cbData = RT_UOFFSETOF(VBOXCRCMDCTL_HGCM, aParms[5]);
+    size_t cbData = RT_UOFFSETOF_DYN(VBOXCRCMDCTL_HGCM, aParms[5]); /* (clang doesn't think this is a POD, thus _DYN.) */
     VBOXCRCMDCTL_HGCM *pData = (VBOXCRCMDCTL_HGCM *)alloca(cbData);
 

trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp

@@ -264 +264 @@
     PDMIHOSTAUDIO        IHostAudio;
     /** Pointer to the console object. */
-    ComObjPtr<Console>   pConsole;
+    ComPtr<Console>      pConsole;
     /** Pointer to the DrvAudio port interface that is above us. */
     PPDMIAUDIOCONNECTOR  pDrvAudio;
@@ -272 +272 @@
 
 /** Makes DRVAUDIOVIDEOREC out of PDMIHOSTAUDIO. */
-#define PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface) \
-    ( (PDRVAUDIOVIDEOREC)((uintptr_t)pInterface - RT_UOFFSETOF(DRVAUDIOVIDEOREC, IHostAudio)) )
+#define PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface) /* (clang doesn't think it is a POD, thus _DYN.) */ \
+    ( (PDRVAUDIOVIDEOREC)((uintptr_t)pInterface - RT_UOFFSETOF_DYN(DRVAUDIOVIDEOREC, IHostAudio)) )
 
 /**