aboutsummaryrefslogtreecommitdiff
path: root/lib/libcxx/include/__format/format_parse_context.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libcxx/include/__format/format_parse_context.h')
-rw-r--r--lib/libcxx/include/__format/format_parse_context.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/libcxx/include/__format/format_parse_context.h b/lib/libcxx/include/__format/format_parse_context.h
index db39c1b548..289cab9f0e 100644
--- a/lib/libcxx/include/__format/format_parse_context.h
+++ b/lib/libcxx/include/__format/format_parse_context.h
@@ -18,9 +18,6 @@
#pragma GCC system_header
#endif
-_LIBCPP_PUSH_MACROS
-#include <__undef_macros>
-
_LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17
@@ -29,8 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
// If the compiler has no concepts support, the format header will be disabled.
// Without concepts support enable_if needs to be used and that too much effort
// to support compilers with partial C++20 support.
-#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && \
- !defined(_LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED)
+#if !defined(_LIBCPP_HAS_NO_CONCEPTS)
template <class _CharT>
class _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT basic_format_parse_context {
@@ -100,14 +96,14 @@ private:
};
using format_parse_context = basic_format_parse_context<char>;
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
using wformat_parse_context = basic_format_parse_context<wchar_t>;
+#endif
-#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED)
+#endif // !defined(_LIBCPP_HAS_NO_CONCEPTS)
#endif //_LIBCPP_STD_VER > 17
_LIBCPP_END_NAMESPACE_STD
-_LIBCPP_POP_MACROS
-
#endif // _LIBCPP___FORMAT_FORMAT_PARSE_CONTEXT_H