Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions stl/inc/system_error
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ _NODISCARD const _Ty& _Immortalize_memcpy_image() noexcept {
[[_Clang::__require_constant_initialization__]] static _Ty _Static;
return _Static;
}
#elif !defined(_M_CEE) // TRANSITION, VSO-1153256
#elif !defined(_M_CEE)
template <class _Ty>
struct _Constexpr_immortalize_impl {
union {
Expand All @@ -676,7 +676,7 @@ _NODISCARD const _Ty& _Immortalize_memcpy_image() noexcept {
static _Constexpr_immortalize_impl<_Ty> _Static;
return _Static._Storage;
}
#else // ^^^ no workaround / workaround vvv
#else // ^^^ !defined(_M_CEE) / defined(_M_CEE), TRANSITION, VSO-1153256 vvv
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No change requested: There are two spaces here but it's not worth resetting testing, I'll fix it up later.

template <class _Ty>
_NODISCARD const _Ty& _Immortalize_memcpy_image() noexcept {
// return reference to a memcpy'd default-initialized _Ty
Expand All @@ -695,7 +695,7 @@ _NODISCARD const _Ty& _Immortalize_memcpy_image() noexcept {
_Storage[0].store(_Target_iter[0], memory_order_release);
return reinterpret_cast<_Ty&>(_Storage);
}
#endif // choose immortalize strategy
#endif // ^^^ defined(_M_CEE), TRANSITION, VSO-1153256 ^^^

_EXPORT_STD _NODISCARD inline const error_category& generic_category() noexcept {
return _Immortalize_memcpy_image<_Generic_error_category>();
Expand Down
6 changes: 3 additions & 3 deletions stl/src/excptptr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace {
/* MAGIC */ static _Immortalizer_impl<_Ty> _Static;
return reinterpret_cast<_Ty&>(_Static._Storage);
}
#elif !defined(_M_CEE) // _M_CEE test is TRANSITION, VSO-1153256
#elif !defined(_M_CEE)
template <class _Ty>
struct _Constexpr_excptptr_immortalize_impl {
union {
Expand All @@ -67,7 +67,7 @@ namespace {
[[nodiscard]] _Ty& _Immortalize() noexcept {
return _Immortalize_impl<_Ty>._Storage;
}
#else // choose immortalize strategy
#else // ^^^ !defined(_M_CEE) / defined(_M_CEE), TRANSITION, VSO-1153256 vvv
template <class _Ty>
int __stdcall _Immortalize_impl(void*, void* _Storage_ptr, void**) noexcept {
// adapt True Placement New to _Execute_once
Expand All @@ -86,7 +86,7 @@ namespace {

return reinterpret_cast<_Ty&>(_Storage);
}
#endif // _M_CEE_PURE
#endif // ^^^ !defined(_M_CEE_PURE) && defined(_M_CEE), TRANSITION, VSO-1153256 ^^^

void _PopulateCppExceptionRecord(
_EXCEPTION_RECORD& _Record, const void* const _PExcept, ThrowInfo* _PThrow) noexcept {
Expand Down