Skip to content

handle deprecation of std::uncaught_exception() #2097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 23, 2025
Merged

handle deprecation of std::uncaught_exception() #2097

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1799e47
handle deprecation of std::uncaught_exception()
kevinushey Jul 21, 2025
a9ea5f4
update NEWS
kevinushey Jul 21, 2025
34743ba
Merged origin/main into bugfix/catch-std-uncaught-exception
hadley Jul 23, 2025
d0b067f
Update news bullet
hadley Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

# testthat 3.2.3

* Fixed an issue preventing compilation from succeeding due to
deprecation / removal of `std::uncaught_exception()`. (@kevinushey, #2047)

* Fixed an issue where `expect_no_error(1)` was failing (#2037).

* Fixed an issue where calling `skip()` outside of an active test could
Expand Down
13 changes: 11 additions & 2 deletions inst/include/testthat/vendor/catch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,15 @@

namespace Catch {

inline bool HasUncaughtException()
{
#if __cplusplus >= 202002L
return std::uncaught_exceptions() > 0;
#else
return std::uncaught_exception();
#endif
}

struct IConfig;

struct CaseSensitive { enum Choice {
Expand Down Expand Up @@ -8379,7 +8388,7 @@ namespace Catch {
{}

ScopedMessage::~ScopedMessage() {
if ( !std::uncaught_exception() ){
if ( !HasUncaughtException() ){
getResultCapture().popScopedMessage(m_info);
}
}
Expand Down Expand Up @@ -8702,7 +8711,7 @@ namespace Catch {
Section::~Section() {
if( m_sectionIncluded ) {
SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
if( std::uncaught_exception() )
if( HasUncaughtException() )
getResultCapture().sectionEndedEarly( endInfo );
else
getResultCapture().sectionEnded( endInfo );
Expand Down
Loading