Changeset 85193 in vbox

Timestamp:

Jul 10, 2020 3:09:57 PM (4 years ago)

Author:

vboxsync

Message:

VBoxDDUDeps.cpp,DevINIP.cpp: Workaround for Clang 11 nothrow bug/weirdness. bugref:9794

Location:

trunk/src/VBox/Devices

Files:

• Network/DevINIP.cpp (modified) (1 diff)
• build/VBoxDDUDeps.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevINIP.cpp

@@ -131 +131 @@
  * using .a libraries for now.
  */
-static const PFNRT g_pDevINILinkHack[] =
-{
-    (PFNRT)lwip_socket,
-    (PFNRT)lwip_close,
-    (PFNRT)lwip_setsockopt,
-    (PFNRT)lwip_recv,
-    (PFNRT)lwip_send,
-    (PFNRT)lwip_select
+static const struct CLANG11WEIRDNESS { PFNRT pfn; } g_pDevINILinkHack[] =
+{
+    { (PFNRT)lwip_socket },
+    { (PFNRT)lwip_close },
+    { (PFNRT)lwip_setsockopt },
+    { (PFNRT)lwip_recv },
+    { (PFNRT)lwip_send },
+    { (PFNRT)lwip_select },
 };
 

trunk/src/VBox/Devices/build/VBoxDDUDeps.cpp

@@ -34 +34 @@
  * function pointers to code which is wanted in the link.
  */
-PFNRT g_apfnVBoxDDUDeps[] =
+struct CLANG11WEIRDNESS { PFNRT pfn; } g_apfnVBoxDDUDeps[] =
 {
-    (PFNRT)VDInit,
-    (PFNRT)VDIfCreateVfsStream,
-    (PFNRT)VDIfCreateFromVfsStream,
-    (PFNRT)VDCreateVfsFileFromDisk,
-    (PFNRT)VDIfTcpNetInstDefaultCreate,
+    { (PFNRT)VDInit },
+    { (PFNRT)VDIfCreateVfsStream },
+    { (PFNRT)VDIfCreateFromVfsStream },
+    { (PFNRT)VDCreateVfsFileFromDisk },
+    { (PFNRT)VDIfTcpNetInstDefaultCreate },
 #ifdef VBOX_WITH_USB
-    (PFNRT)USBFilterInit,
-    (PFNRT)USBLibHashSerial,
+    { (PFNRT)USBFilterInit },
+    { (PFNRT)USBLibHashSerial },
 # ifdef RT_OS_OS2
-    (PFNRT)UsbOpen,
+    { (PFNRT)UsbOpen },
 # endif
 # if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS) /* PORTME */
-    (PFNRT)USBLibInit,
+    { (PFNRT)USBLibInit },
 # endif
 #endif /* VBOX_WITH_USB */
-    NULL
+    { NULL },
 };