[libcxx] r322794 - libcxx: Define set_unexpected, _get_unexpected and __uncaught_exceptions without dllimport.

Peter Collingbourne via cfe-commits cfe-commits at lists.llvm.org
Wed Jan 17 16:33:35 PST 2018


Author: pcc
Date: Wed Jan 17 16:33:35 2018
New Revision: 322794

URL: http://llvm.org/viewvc/llvm-project?rev=322794&view=rev
Log:
libcxx: Define set_unexpected, _get_unexpected and __uncaught_exceptions without dllimport.

It turns out that the MSVC headers define these functions without
dllimport even when compiling with /MD. This change fixes the resulting
compile-time error.

Differential Revision: https://reviews.llvm.org/D42207

Modified:
    libcxx/trunk/src/support/runtime/exception_msvc.ipp

Modified: libcxx/trunk/src/support/runtime/exception_msvc.ipp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/support/runtime/exception_msvc.ipp?rev=322794&r1=322793&r2=322794&view=diff
==============================================================================
--- libcxx/trunk/src/support/runtime/exception_msvc.ipp (original)
+++ libcxx/trunk/src/support/runtime/exception_msvc.ipp Wed Jan 17 16:33:35 2018
@@ -22,11 +22,11 @@ _LIBCPP_CRT_FUNC terminate_handler __cde
 _LIBCPP_CRT_FUNC terminate_handler __cdecl _get_terminate();
 
 typedef void (__cdecl* unexpected_handler)();
-_LIBCPP_CRT_FUNC unexpected_handler __cdecl set_unexpected(
+unexpected_handler __cdecl set_unexpected(
     unexpected_handler _NewUnexpectedHandler) throw();
-_LIBCPP_CRT_FUNC unexpected_handler __cdecl _get_unexpected();
+unexpected_handler __cdecl _get_unexpected();
 
-_LIBCPP_CRT_FUNC int __cdecl __uncaught_exceptions();
+int __cdecl __uncaught_exceptions();
 }
 
 namespace std {




More information about the cfe-commits mailing list