Skip to content

Commit b6eb537

Browse files
committed
[libc++][C++03] Make __libcpp_verbose_abort noexcept and fix the test for it
1 parent 0ebcc97 commit b6eb537

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

libcxx/include/__cxx03/__verbose_abort

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2121
// This function should never be called directly from the code -- it should only be called through
2222
// the _LIBCPP_VERBOSE_ABORT macro.
2323
_LIBCPP_NORETURN _LIBCPP_AVAILABILITY_VERBOSE_ABORT _LIBCPP_OVERRIDABLE_FUNC_VIS
24-
_LIBCPP_ATTRIBUTE_FORMAT(__printf__, 1, 2) void __libcpp_verbose_abort(const char* __format, ...);
24+
_LIBCPP_ATTRIBUTE_FORMAT(__printf__, 1, 2) void __libcpp_verbose_abort(const char* __format, ...) _NOEXCEPT;
2525

2626
// _LIBCPP_VERBOSE_ABORT(format, args...)
2727
//

libcxx/test/libcxx-03/assertions/customize_verbose_abort.link-time.pass.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
// failures when back-deploying.
1313
// XFAIL: availability-verbose_abort-missing
1414

15-
// XFAIL: FROZEN-CXX03-HEADERS-FIXME
16-
17-
#include <__verbose_abort>
15+
#include <__cxx03/__verbose_abort>
1816
#include <cstdlib>
1917

2018
void std::__libcpp_verbose_abort(char const*, ...) _NOEXCEPT { std::exit(EXIT_SUCCESS); }

0 commit comments

Comments
 (0)