Fix Windows?

Author: vogelsgesang

libcxx/include/__exception/exception_ptr.h

@@ -123,8 +123,8 @@ class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {
     __y.__ptr_  = __tmp;
   }
 
-  friend _LIBCPP_EXPORTED_FROM_ABI exception_ptr current_exception() _NOEXCEPT;
-  friend _LIBCPP_EXPORTED_FROM_ABI void rethrow_exception(exception_ptr);
+  friend exception_ptr current_exception() _NOEXCEPT;
+  friend void rethrow_exception(exception_ptr);
 };
 
 // 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 {
 
 #else // _LIBCPP_ABI_MICROSOFT
 
-class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {
+class exception_ptr {
   _LIBCPP_DIAGNOSTIC_PUSH
   _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wunused-private-field")
   void* __ptr1_;

libcxx/include/__exception/exception_ptr_glibcxx.ipp

@@ -38,9 +38,9 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE inline void exception_ptr::__decreme
     reinterpret_cast<__exception_ptr::exception_ptr*>(this)->_M_release();
 }
 
-[[noreturn]] void rethrow_exception(__exception_ptr::exception_ptr);
+[[__noreturn__]] void rethrow_exception(__exception_ptr::exception_ptr);
 
-_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE [[noreturn]] void rethrow_exception(exception_ptr __ptr) {
+[[__noreturn__]] _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE void rethrow_exception(exception_ptr __ptr) {
   rethrow_exception(reinterpret_cast<__exception_ptr::exception_ptr&>(__ptr));
 }
 

libcxx/include/__exception/exception_ptr_msvc.ipp

@@ -31,17 +31,17 @@ _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr& exception_ptr::operator=(con
   return *this;
 }
 
-_LIBCPP_EXPORTED_FROM_LIB_INLINEABLEexception_ptr& exception_ptr::operator=(nullptr_t) _NOEXCEPT {
-  exception_ptr dummy;
-  __ExceptionPtrAssign(this, &dummy);
+_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr& exception_ptr::operator=(nullptr_t) _NOEXCEPT {
+  exception_ptr __dummy;
+  __ExceptionPtrAssign(this, &__dummy);
   return *this;
 }
 
 _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr::~exception_ptr() _NOEXCEPT { __ExceptionPtrDestroy(this); }
 
 _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr::operator bool() const _NOEXCEPT { return __ExceptionPtrToBool(this); }
 
-_LIBCPP_EXPORTED_FROM_LIB_INLINEABLEbool operator==(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT {
+_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE bool operator==(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT {
   return __ExceptionPtrCompare(&__x, &__y);
 }
 
@@ -54,12 +54,12 @@ _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr __copy_exception_ptr(void* __
   return __ret;
 }
 
-_LIBCPP_EXPORTED_FROM_LIB_INLINEABLEexception_ptr current_exception() _NOEXCEPT {
+_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr current_exception() _NOEXCEPT {
   exception_ptr __ret;
   __ExceptionPtrCurrentException(&__ret);
   return __ret;
 }
 
-_LIBCPP_EXPORTED_FROM_LIB_INLINEABLE [[noreturn]] void rethrow_exception(exception_ptr __ptr) { __ExceptionPtrRethrow(&__ptr); }
+[[__noreturn__]] _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE void rethrow_exception(exception_ptr __ptr) { __ExceptionPtrRethrow(&__ptr); }
 
 } // namespace std