Skip to content

Commit 0c0fde7

Browse files
committed
Fix Windows?
1 parent 2302ae7 commit 0c0fde7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

libcxx/include/__exception/exception_ptr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {
123123
__y.__ptr_ = __tmp;
124124
}
125125

126-
friend _LIBCPP_EXPORTED_FROM_ABI exception_ptr current_exception() _NOEXCEPT;
127-
friend _LIBCPP_EXPORTED_FROM_ABI void rethrow_exception(exception_ptr);
126+
friend exception_ptr current_exception() _NOEXCEPT;
127+
friend void rethrow_exception(exception_ptr);
128128
};
129129

130130
// Must be defined outside the class definition due to _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE
@@ -232,7 +232,7 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep) _NOEXCEPT {
232232

233233
#else // _LIBCPP_ABI_MICROSOFT
234234

235-
class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {
235+
class exception_ptr {
236236
_LIBCPP_DIAGNOSTIC_PUSH
237237
_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wunused-private-field")
238238
void* __ptr1_;

libcxx/include/__exception/exception_ptr_msvc.ipp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr& exception_ptr::operator=(con
3131
return *this;
3232
}
3333

34-
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLEexception_ptr& exception_ptr::operator=(nullptr_t) _NOEXCEPT {
35-
exception_ptr dummy;
36-
__ExceptionPtrAssign(this, &dummy);
34+
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr& exception_ptr::operator=(nullptr_t) _NOEXCEPT {
35+
exception_ptr __dummy;
36+
__ExceptionPtrAssign(this, &__dummy);
3737
return *this;
3838
}
3939

4040
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr::~exception_ptr() _NOEXCEPT { __ExceptionPtrDestroy(this); }
4141

4242
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr::operator bool() const _NOEXCEPT { return __ExceptionPtrToBool(this); }
4343

44-
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLEbool operator==(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT {
44+
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE bool operator==(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT {
4545
return __ExceptionPtrCompare(&__x, &__y);
4646
}
4747

@@ -54,7 +54,7 @@ _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr __copy_exception_ptr(void* __
5454
return __ret;
5555
}
5656

57-
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLEexception_ptr current_exception() _NOEXCEPT {
57+
_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr current_exception() _NOEXCEPT {
5858
exception_ptr __ret;
5959
__ExceptionPtrCurrentException(&__ret);
6060
return __ret;

0 commit comments

Comments
 (0)