diff --git a/src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx b/src/3rdParty/salomesmesh/inc/SMESH_ExceptHandlers.hxx
index e610a8c1ea..79b6aefe63 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 6cf1c56c05..a81c8b0033 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 )