diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2018-01-18 00:33:35 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2018-01-18 00:33:35 +0000 |
| commit | 5e27cce46729ab431da4e503c651763a0798e5a5 (patch) | |
| tree | c9b9ade41c0f5c1ee88c202b2faaf1bf70ff83bb /libcxx/src/support | |
| parent | dd77ed51e740f37072963c34fa764fe19e3070b0 (diff) | |
| download | bcm5719-llvm-5e27cce46729ab431da4e503c651763a0798e5a5.tar.gz bcm5719-llvm-5e27cce46729ab431da4e503c651763a0798e5a5.zip | |
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
llvm-svn: 322794
Diffstat (limited to 'libcxx/src/support')
| -rw-r--r-- | libcxx/src/support/runtime/exception_msvc.ipp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/src/support/runtime/exception_msvc.ipp b/libcxx/src/support/runtime/exception_msvc.ipp index 7dc1b57d48e..854d3864f79 100644 --- a/libcxx/src/support/runtime/exception_msvc.ipp +++ b/libcxx/src/support/runtime/exception_msvc.ipp @@ -22,11 +22,11 @@ _LIBCPP_CRT_FUNC terminate_handler __cdecl set_terminate( _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 { |
