Changeset 95109 in vbox

Timestamp:

May 25, 2022 8:37:03 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/xml: Having another go at the PFNEXTERNALENTITYLOADER declaration to make it work for VC++ in c++17 mode. (noexcept/c++17)

Location:

trunk

Files:

• include/iprt/cpp/xml.h (modified) (1 diff)
• src/VBox/Runtime/r3/xml.cpp (modified) (1 diff)

trunk/include/iprt/cpp/xml.h

@@ -364 +364 @@
 
 
-#if RT_CLANG_PREREQ(4, 0) /* VC++ needs the nothrow'ed-ness, while clang barfs at it. */
-typedef xmlParserInput *FNEXTERNALENTITYLOADER(const char *aURI, const char *aID, xmlParserCtxt *aCtxt);
-#else
 typedef DECLCALLBACKTYPE_EX(xmlParserInput *, RT_NOTHING, FNEXTERNALENTITYLOADER,(const char *aURI, const char *aID,
                                                                                   xmlParserCtxt *aCtxt));
-#endif
-typedef FNEXTERNALENTITYLOADER *PFNEXTERNALENTITYLOADER; /**< xmlExternalEntityLoader */
+typedef FNEXTERNALENTITYLOADER *PFNEXTERNALENTITYLOADER; /**< xmlExternalEntityLoader w/ noexcept. */
 
 class RT_DECL_CLASS GlobalLock

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -427 +427 @@
 void GlobalLock::setExternalEntityLoader(PFNEXTERNALENTITYLOADER pfnLoader)
 {
-    m->pfnOldLoader = xmlGetExternalEntityLoader();
+    m->pfnOldLoader = (PFNEXTERNALENTITYLOADER)xmlGetExternalEntityLoader();
     xmlSetExternalEntityLoader(pfnLoader);
 }