VirtualBox

Changeset 95113 in vbox


Ignore:
Timestamp:
May 25, 2022 8:47:13 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
151594
Message:

IPRT/win: Export and import library adjustments for C++17 and noexcept being part of the type system.

Location:
trunk/src/VBox/Runtime
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Runtime/Makefile.kmk

    r94874 r95113  
    24272427                | $$(dir $$@) #$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcp100-win32.def
    24282428        $(RM) -f -- $@
    2429         $(REDIRECT) -wto $@ -- $(CAT_EXT) $^
     2429        $(SED)  --output "$@" \
     2430                $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86"  ,-e "/not-x86/d",  -e "/only-x86/d") \
     2431                $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64",-e "/not-amd64/d",-e "/only-amd64/d") \
     2432                $(if-expr "$(KBUILD_TARGET_ARCH)" == "arm64",-e "/not-arm64/d",-e "/only-arm64/d") \
     2433                $(if-expr "$(substr $(if-expr $(KBUILD_TARGET) != 'win',$(VBOX_GCC_std), $(VBOX_VCC_std)),-2)" >= "17" \
     2434                                                            ,-e "/before-noexcept/d", -e "/after-noexcept/d") \
     2435                $^
    24302436endif
    24312437
    … …  
    25562562                | $$(dir $$@) # Hopefully no need to export openssl here.
    25572563        $(RM) -f -- $@
    2558         $(REDIRECT) -wto $@ -- $(CAT_EXT) $^
     2564        $(SED)  --output "$@" \
     2565                -e "/not-x86/d" \
     2566                -e "/only-amd64/d" \
     2567                -e "/only-arm64/d" \
     2568                $(if-expr "$(substr $(if-expr $(KBUILD_TARGET) != 'win',$(VBOX_GCC_std), $(VBOX_VCC_std)),-2)" >= "17" \
     2569                                                            ,-e "/before-noexcept/d", -e "/after-noexcept/d") \
     2570                $^
    25592571endif
    25602572
    … …  
    26192631        $(if-expr "$(KBUILD_TARGET_ARCH)" == "arm64",-e "/not-arm64/d",-e "/only-arm64/d") \
    26202632        $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.arm64",, -e "/only-darwin.arm64/d") \
    2621         $(if-expr "$(substr $(VBOX_GCC_std),-2)" >= "17", -e "/before-noexcept/d", -e "/after-noexcept/d") \
     2633                $(if-expr "$(substr $(if-expr $(KBUILD_TARGET) != 'win',$(VBOX_GCC_std), $(VBOX_VCC_std)),-2)" >= "17" \
     2634                                                            ,-e "/before-noexcept/d", -e "/after-noexcept/d") \
    26222635                -f "$<" $(filter %.def, $^)
    26232636endif

  • trunk/src/VBox/Runtime/VBox/DefToAsmExterns.sed

    r93115 r95113  
    2929#
    3030/not-some-systems/d
     31
     32#
     33# Check the external side of function aliases.
     34#
     35s/=[^ ;]*//
    3136
    3237#

  • trunk/src/VBox/Runtime/VBox/VBoxRTImp-vcc32.def

    r93115 r95113  
    539539    ?setByString@RTCRestStringEnumBase@@QAEHABVRTCString@@@Z                    ; (public: int __thiscall RTCRestStringEnumBase::setByString(class RTCString const &))
    540540    ?setByString@RTCRestStringEnumBase@@QAEHPBDI@Z                              ; (public: int __thiscall RTCRestStringEnumBase::setByString(char const *,unsigned int))
    541     ?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@ZPAX@Z    ; (public: void __thiscall RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned int,unsigned int,unsigned __int64,unsigned __int64),void *))
     541    ?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@ZPAX@Z      ; before-noexcept ; (public: void __thiscall RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned int,unsigned int,unsigned __int64,unsigned __int64),void *))
     542    ?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@_EPAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@ZPAX@Z      ; before-noexcept ; (public: void __thiscall RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned int,unsigned int,unsigned __int64,unsigned __int64),void *))
     543    ?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@_EPAX@Z ; after-noexcept  ; (public: void __thiscall RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned int,unsigned int,unsigned __int64,unsigned __int64),void *))
     544    ?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@ZPAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@_EPAX@Z ; after-noexcept  ; (public: void __thiscall RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned int,unsigned int,unsigned __int64,unsigned __int64),void *))
    542545    ?setContent@ElementNode@xml@@QAEPAVContentNode@2@ABVRTCString@@@Z           ; (public: class xml::ContentNode * __thiscall xml::ElementNode::setContent(class RTCString const &))
    543546    ?setContentType@RTCRestBinaryParameter@@QAEHPBD@Z                           ; (public: int __thiscall RTCRestBinaryParameter::setContentType(char const *))
    … …  
    550553    ?setNull@RTCRestString@@UAEHXZ                                              ; (public: virtual int __thiscall RTCRestString::setNull(void))
    551554    ?setNull@RTCString@@QAEXXZ                                                  ; (public: void __thiscall RTCString::setNull(void))
    552     ?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@Z12@Z   ; (public: void __thiscall RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned int,unsigned __int64,unsigned int *),void *,unsigned __int64))
     555    ?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@Z12@Z   ; before-noexcept; (public: void __thiscall RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned int,unsigned __int64,unsigned int *),void *,unsigned __int64))
     556    ?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@_E12@Z=?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@Z12@Z   ; before-noexcept; (public: void __thiscall RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned int,unsigned __int64,unsigned int *),void *,unsigned __int64))
     557    ?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@_E12@Z   ; after-noexcept; (public: void __thiscall RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned int,unsigned __int64,unsigned int *),void *,unsigned __int64))
     558    ?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@Z12@Z=?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@_E12@Z   ; after-noexcept; (public: void __thiscall RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned int,unsigned __int64,unsigned int *),void *,unsigned __int64))
    553559    ?setServerAuthority@RTCRestClientApiBase@@QAEHPBD@Z                         ; (public: int __thiscall RTCRestClientApiBase::setServerAuthority(char const *))
    554560    ?setServerBasePath@RTCRestClientApiBase@@QAEHPBD@Z                          ; (public: int __thiscall RTCRestClientApiBase::setServerBasePath(char const *))

  • trunk/src/VBox/Runtime/VBox/VBoxRTImp-vcc64.def

    r93115 r95113  
    540540    ?setByString@RTCRestStringEnumBase@@QEAAHPEBD_K@Z                           ; (public: int __cdecl RTCRestStringEnumBase::setByString(char const *,unsigned __int64))
    541541    ?setCAFile@RTCRestClientApiBase@@QEAAHAEBVRTCString@@@Z                     ; (public: int __cdecl RTCRestClientApiBase::setCAFile(class RTCString const &))
    542     ?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@ZPEAX@Z  ; (public: void __cdecl RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned __int64,unsigned int,unsigned __int64,unsigned __int64),void *))
     542    ?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@ZPEAX@Z  ; before-noexcept ; (public: void __cdecl RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned __int64,unsigned int,unsigned __int64,unsigned __int64),void *))
     543    ?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@_EPEAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@ZPEAX@Z ; before-noexcept ; (public: void __cdecl RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned __int64,unsigned int,unsigned __int64,unsigned __int64),void *))
     544    ?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@_EPEAX@Z ; after-noexcept ; (public: void __cdecl RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned __int64,unsigned int,unsigned __int64,unsigned __int64),void *))
     545    ?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@ZPEAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@_EPEAX@Z ; after-noexcept ; (public: void __cdecl RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned __int64,unsigned int,unsigned __int64,unsigned __int64),void *))
    543546    ?setContent@ElementNode@xml@@QEAAPEAVContentNode@2@AEBVRTCString@@@Z        ; (public: class xml::ContentNode * __cdecl xml::ElementNode::setContent(class RTCString const &))
    544547    ?setContentType@RTCRestBinaryParameter@@QEAAHPEBD@Z                         ; (public: int __cdecl RTCRestBinaryParameter::setContentType(char const *))
    … …  
    551554    ?setNull@RTCRestString@@UEAAHXZ                                             ; (public: virtual int __cdecl RTCRestString::setNull(void))
    552555    ?setNull@RTCString@@QEAAXXZ                                                 ; (public: void __cdecl RTCString::setNull(void))
    553     ?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@Z12@Z  ; (public: void __cdecl RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned __int64,unsigned __int64,unsigned __int64 *),void *,unsigned __int64))
     556    ?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@Z12@Z ; before-noexcept  ; (public: void __cdecl RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned __int64,unsigned __int64,unsigned __int64 *),void *,unsigned __int64))
     557    ?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@_E12@Z=?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@Z12@Z ; before-noexcept  ; (public: void __cdecl RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned __int64,unsigned __int64,unsigned __int64 *),void *,unsigned __int64))
     558    ?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@_E12@Z ; after-noexcept  ; (public: void __cdecl RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned __int64,unsigned __int64,unsigned __int64 *),void *,unsigned __int64))
     559    ?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@Z12@Z=?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@_E12@Z ; after-noexcept  ; (public: void __cdecl RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned __int64,unsigned __int64,unsigned __int64 *),void *,unsigned __int64))
    554560    ?setServerAuthority@RTCRestClientApiBase@@QEAAHPEBD@Z                       ; (public: int __cdecl RTCRestClientApiBase::setServerAuthority(char const *))
    555561    ?setServerBasePath@RTCRestClientApiBase@@QEAAHPEBD@Z                        ; (public: int __cdecl RTCRestClientApiBase::setServerBasePath(char const *))

  • trunk/src/VBox/Runtime/r3/win/VBoxRT-win32.def

    r93115 r95113  
    4545    RTStrMemFind32
    4646
     47    ; Export aliases for noexcept affected methods.
     48    ?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@_EPAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@ZPAX@Z      ; before-noexcept ; (public: void __thiscall RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned int,unsigned int,unsigned __int64,unsigned __int64),void *))
     49    ?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@ZPAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QAEXP6AHPAV1@PBXII_K2@_EPAX@Z ; after-noexcept  ; (public: void __thiscall RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned int,unsigned int,unsigned __int64,unsigned __int64),void *))
     50    ?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@_E12@Z=?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@Z12@Z   ; before-noexcept; (public: void __thiscall RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned int,unsigned __int64,unsigned int *),void *,unsigned __int64))
     51    ?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@Z12@Z=?setProducerCallback@RTCRestBinaryParameter@@QAEXP6AHPAV1@PAXI_KPAI@_E12@Z   ; after-noexcept; (public: void __thiscall RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned int,unsigned __int64,unsigned int *),void *,unsigned __int64))
     52
     53

  • trunk/src/VBox/Runtime/r3/win/VBoxRT-win64.def

    r93115 r95113  
    5757    RTStrMemFind32
    5858
     59    ; Export aliases for noexcept affected methods.
     60    ?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@_EPEAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@ZPEAX@Z ; before-noexcept ; (public: void __cdecl RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned __int64,unsigned int,unsigned __int64,unsigned __int64),void *))
     61    ?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@ZPEAX@Z=?setConsumerCallback@RTCRestBinaryResponse@@QEAAXP6AHPEAV1@PEBX_KI22@_EPEAX@Z ; after-noexcept ; (public: void __cdecl RTCRestBinaryResponse::setConsumerCallback(int (__cdecl*)(class RTCRestBinaryResponse *,void const *,unsigned __int64,unsigned int,unsigned __int64,unsigned __int64),void *))
     62    ?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@_E12@Z=?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@Z12@Z ; before-noexcept  ; (public: void __cdecl RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned __int64,unsigned __int64,unsigned __int64 *),void *,unsigned __int64))
     63    ?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@Z12@Z=?setProducerCallback@RTCRestBinaryParameter@@QEAAXP6AHPEAV1@PEAX_K2PEA_K@_E12@Z ; after-noexcept  ; (public: void __cdecl RTCRestBinaryParameter::setProducerCallback(int (__cdecl*)(class RTCRestBinaryParameter *,void *,unsigned __int64,unsigned __int64,unsigned __int64 *),void *,unsigned __int64))
     64
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette