Skip to content

Commit 71d6a04

Browse files
committed
Fix the CI (frozen C++03 headers)
1 parent 261b923 commit 71d6a04

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

libcxx/include/__config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
# define _LIBCPP_FREESTANDING
3939
# endif
4040

41+
// NOLINTNEXTLINE(libcpp-cpp-version-check)
42+
# if __cplusplus < 201103L
43+
# define _LIBCPP_CXX03_LANG
44+
# endif
45+
4146
# if __has_feature(experimental_library)
4247
# ifndef _LIBCPP_ENABLE_EXPERIMENTAL
4348
# define _LIBCPP_ENABLE_EXPERIMENTAL
@@ -213,11 +218,6 @@ _LIBCPP_HARDENING_MODE_DEBUG
213218
# define _LIBCPP_TOSTRING2(x) #x
214219
# define _LIBCPP_TOSTRING(x) _LIBCPP_TOSTRING2(x)
215220

216-
// NOLINTNEXTLINE(libcpp-cpp-version-check)
217-
# if __cplusplus < 201103L
218-
# define _LIBCPP_CXX03_LANG
219-
# endif
220-
221221
# ifndef __has_constexpr_builtin
222222
# define __has_constexpr_builtin(x) 0
223223
# endif

libcxx/vendor/llvm/default_assertion_handler.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# pragma GCC system_header
2626
#endif
2727

28-
#if defined(_LIBCPP_CXX03_LANG) && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
28+
#if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
2929

3030
// Keep the old implementation that doesn't support assertion semantics for backward compatibility with the frozen C++03
3131
// mode.
@@ -59,6 +59,6 @@ _LIBCPP_ASSERTION_SEMANTIC_ENFORCE
5959

6060
# endif // _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_IGNORE
6161

62-
#endif // defined(_LIBCPP_CXX03_LANG) && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
62+
#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
6363

6464
#endif // _LIBCPP___ASSERTION_HANDLER

0 commit comments

Comments
 (0)