kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

smesh: [skip ci] comment out call of std::set_unexpected that has been removed in C++17

Browse Source
This commit is contained in:
wmayer
2020-11-07 19:47:11 +01:00
parent f8bd2c81c3
commit c11a36386b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx vendored
View File

@@ -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); }

3
src/3rdParty/salomesmesh/inc/Utils_ExceptHandlers.hxx vendored
View File

@@ -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 )