smesh: [skip ci] comment out call of std::set_unexpected that has bee…

…n removed in C++17
FreeCAD · Nov 7, 2020 · c11a363 · c11a363
1 parent f8bd2c8
commit c11a363
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 )