Skip to content

Commit 3d6b813

Browse files
committed
Address feedback and fix the CI
1 parent 2ad957b commit 3d6b813

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

libcxx/docs/Hardening.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ to control the level by passing **one** of the following options to the compiler
7474
pre-built components. Most libc++ code is header-based, so a user-provided
7575
value for ``_LIBCPP_HARDENING_MODE`` will be mostly respected.
7676

77-
In some cases, users might want to override the default assertion semantic.
77+
In some cases, users might want to override the assertion semantic used by the
78+
library.
7879
This can be done similarly to setting the hardening mode; please refer to the
7980
:ref:`relevant section <assertion-semantics>`.
8081

libcxx/test/libcxx/assertions/log_hardening_failure.pass.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313

1414
#include <__log_hardening_failure>
1515

16-
static_assert(noexcept(std::__log_hardening_failure("")));
16+
#include "test_macros.h"
17+
18+
ASSERT_NOEXCEPT(std::__log_hardening_failure(""));
1719

1820
int main(int, char**) {
1921
std::__log_hardening_failure("Some message");

libcxx/test/support/check_assertion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ bool ExpectLog(const char* stmt, Func&& func) {
487487
#define TEST_LIBCPP_ASSERT_FAILURE(expr, message) \
488488
assert(( ExpectLog(#expr, [&]() { (void)(expr); }) ))
489489
#else
490-
#error "_LIBCPP_ASSERTION_SEMANTIC is set to an invalid value"
490+
#error "Unknown value for _LIBCPP_ASSERTION_SEMANTIC"
491491
#endif // _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_ENFORCE
492492

493493
#else

0 commit comments

Comments
 (0)