Changeset 91514 in vbox for trunk/src/VBox

Timestamp:

Oct 1, 2021 1:46:42 PM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:9790 - Update the workaround for Clang nothrow/PPFN
issue. It was not fixed in 13.0 so drop that arm of the test. While
here, don't repeat the test two times in one file (though each file is
still on its own).

Location:

trunk/src/VBox/Main/src-server

Files:

• HostVideoInputDeviceImpl.cpp (modified) (2 diffs)
• VRDEServerImpl.cpp (modified) (2 diffs)

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

@@ -131 +131 @@
 typedef FNVBOXHOSTWEBCAMLIST *PFNVBOXHOSTWEBCAMLIST;
 
-#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+
+/*
+ * Work around clang being unhappy about PFNVBOXHOSTWEBCAMLIST
+ * ("exception specifications are not allowed beyond a single level of
+ * indirection").  The original comment for 13.0 check said: "assuming
+ * this issue will be fixed eventually".  Well, 13.0 is now out, and
+ * it was not.
+ */
+#define CLANG_EXCEPTION_SPEC_HACK (RT_CLANG_PREREQ(11, 0) /* && !RT_CLANG_PREREQ(13, 0) */)
+
+#if CLANG_EXCEPTION_SPEC_HACK
 static int loadHostWebcamLibrary(const char *pszPath, RTLDRMOD *phmod, void **ppfn)
 #else
@@ -189 +199 @@
         PFNVBOXHOSTWEBCAMLIST pfn = NULL;
         RTLDRMOD hmod = NIL_RTLDRMOD;
-#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+#if CLANG_EXCEPTION_SPEC_HACK
         int vrc = loadHostWebcamLibrary(strLibrary.c_str(), &hmod, (void **)&pfn);
 #else

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

@@ -451 +451 @@
 }
 
-#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+/*
+ * Work around clang being unhappy about PFNVRDESUPPORTEDPROPERTIES
+ * ("exception specifications are not allowed beyond a single level of
+ * indirection").  The original comment for 13.0 check said: "assuming
+ * this issue will be fixed eventually".  Well, 13.0 is now out, and
+ * it was not.
+ */
+#define CLANG_EXCEPTION_SPEC_HACK (RT_CLANG_PREREQ(11, 0) /* && !RT_CLANG_PREREQ(13, 0) */)
+
+#if CLANG_EXCEPTION_SPEC_HACK
 static int loadVRDELibrary(const char *pszLibraryName, RTLDRMOD *phmod, void *ppfn)
 #else
@@ -547 +556 @@
         PFNVRDESUPPORTEDPROPERTIES pfn = NULL;
         RTLDRMOD hmod = NIL_RTLDRMOD;
-#if RT_CLANG_PREREQ(11, 0) && !RT_CLANG_PREREQ(13, 0) /*assuming this issue will be fixed eventually*/
+#if CLANG_EXCEPTION_SPEC_HACK
         vrc = loadVRDELibrary(strVrdeLibrary.c_str(), &hmod, (void **)&pfn);
 #else