From 488e7893861b52b0c5bcb7b91061b0db7009ae73 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Mon, 9 May 2022 16:57:49 -0700 Subject: [PATCH] Block C++98 `unexpected()` from being restored in C++23 mode (#2709) --- stl/inc/yvals_core.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index 68f36b0db..3961c40de 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -684,6 +684,10 @@ #define _HAS_UNEXPECTED (!_HAS_CXX17) #endif // _HAS_UNEXPECTED +#if _HAS_UNEXPECTED && _HAS_CXX23 +#error STL1004: C++98 unexpected() is incompatible with C++23 unexpected. +#endif // _HAS_UNEXPECTED && _HAS_CXX23 + // P0004R1 Removing Deprecated Iostreams Aliases #ifndef _HAS_OLD_IOSTREAMS_MEMBERS #define _HAS_OLD_IOSTREAMS_MEMBERS (!_HAS_CXX17)