Skip to content

Update deprecated 'std::uncaught_exception' to its C++17 equivalent #259

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
Mortal merged 1 commit into from
Mar 9, 2023
Merged

Update deprecated 'std::uncaught_exception' to its C++17 equivalent #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tpie/fractional_progress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ void fractional_subindicator::done() {

fractional_subindicator::~fractional_subindicator() {
#ifndef TPIE_NDEBUG
if (!m_init_called && m_fraction > 0.00001 && !std::uncaught_exception()) {
if (!m_init_called && m_fraction > 0.00001 && !std::uncaught_exceptions()) {
std::stringstream s;
if (!m_stat.empty()) {
s << "A fractional_subindicator for ``" << m_stat << "'' was assigned a non-zero fraction but never initialized." << std::endl;
Expand Down Expand Up @@ -323,7 +323,7 @@ void fractional_progress::done() {

fractional_progress::~fractional_progress() {
#ifndef TPIE_NDEBUG
if (m_init_called && !m_done_called && !std::uncaught_exception()) {
if (m_init_called && !m_done_called && !std::uncaught_exceptions()) {
std::stringstream s;
s << "A fractional_progress was destructed without done being called." << std::endl;
TP_LOG_FATAL(s.str());
Expand Down
2 changes: 1 addition & 1 deletion tpie/progress_indicator_subindicator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void progress_indicator_subindicator::setup(progress_indicator_base * parent,

#ifndef TPIE_NDEBUG
progress_indicator_subindicator::~progress_indicator_subindicator() {
if (m_init_called && !m_done_called && !std::uncaught_exception()) {
if (m_init_called && !m_done_called && !std::uncaught_exceptions()) {
std::stringstream s;
s << "A progress_indicator_subindicator was destructed without done being called." << std::endl;
TP_LOG_FATAL(s.str());
Expand Down