From c11a36386b3abcbbdccf19bf97489d9b0ef97295 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 7 Nov 2020 19:47:11 +0100 Subject: [PATCH] smesh: [skip ci] comment out call of std::set_unexpected that has been removed in C++17 --- src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx | 5 +++-- src/3rdParty/salomesmesh/inc/Utils_ExceptHandlers.hxx | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx b/src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx index e610a8c1eaa9..79b6aefe6394 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx @@ -51,9 +51,10 @@ class SMESH_EXPORT Unexpect { //save / retrieve unexpected exceptions treatment PVF old; public : #ifndef WNT + // std::set_unexpected has been removed in C++17 Unexpect( PVF f ) - { old = std::set_unexpected(f); } - ~Unexpect() { std::set_unexpected(old); } + { /*old = std::set_unexpected(f);*/old = f; } + ~Unexpect() { /*std::set_unexpected(old);*/ } #else Unexpect( PVF f ) { old = std::set_unexpected(f); } diff --git a/src/3rdParty/salomesmesh/inc/Utils_ExceptHandlers.hxx b/src/3rdParty/salomesmesh/inc/Utils_ExceptHandlers.hxx index 6cf1c56c05d5..a81c8b00337c 100644 --- a/src/3rdParty/salomesmesh/inc/Utils_ExceptHandlers.hxx +++ b/src/3rdParty/salomesmesh/inc/Utils_ExceptHandlers.hxx @@ -39,8 +39,9 @@ class UTILS_EXPORT Unexpect { //save / retrieve unexpected exceptions treatment PVF old; public : #ifndef WIN32 + // std::set_unexpected has been removed in C++17 Unexpect( PVF f ) - { old = std::set_unexpected(f); } + { /*old = std::set_unexpected(f);*/old = f; } ~Unexpect() { std::set_unexpected(old); } #else Unexpect( PVF f )