From 8321d5a834f6e015ac73884a351af6a35ee802a0 Mon Sep 17 00:00:00 2001
From: vuzlov <vuzlov@opencascade.com>
Date: Fri, 4 Sep 2020 14:55:51 +0300
Subject: [PATCH] #18963 Change throw() -> noexcept

---
 src/bases/AutoRefCnt.hxx           | 2 +-
 src/bases/Exception.cxx            | 4 ++--
 src/bases/Exception.hxx            | 4 ++--
 src/engine/ConversionException.cxx | 2 +-
 src/engine/ConversionException.hxx | 2 +-
 src/engine/ForEachLoop.cxx         | 3 ++-
 src/py2yacs/py2yacs.cxx            | 4 ++--
 src/py2yacs/py2yacs.hxx            | 4 ++--
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/bases/AutoRefCnt.hxx b/src/bases/AutoRefCnt.hxx
index 480a693c5..589a10bc2 100644
--- a/src/bases/AutoRefCnt.hxx
+++ b/src/bases/AutoRefCnt.hxx
@@ -82,7 +82,7 @@ namespace YACS
     };
 
     template<class T, class U>
-    typename YACS::BASES::AutoRefCnt<U> DynamicCast(typename YACS::BASES::AutoRefCnt<T>& autoSubPtr) throw()
+    typename YACS::BASES::AutoRefCnt<U> DynamicCast(typename YACS::BASES::AutoRefCnt<T>& autoSubPtr) noexcept
     {
       T *subPtr(autoSubPtr);
       U *ptr(dynamic_cast<U *>(subPtr));
diff --git a/src/bases/Exception.cxx b/src/bases/Exception.cxx
index 48ec735a6..f8cf8af68 100644
--- a/src/bases/Exception.cxx
+++ b/src/bases/Exception.cxx
@@ -47,11 +47,11 @@ Exception::Exception(const std::string& what,int errNumber):_what(what),errNumbe
 #endif
 }
 
-const char *Exception::what( void ) const throw ()
+const char *Exception::what( void ) const noexcept
 {
   return _what.c_str();
 }
 
-Exception::~Exception() throw ()
+Exception::~Exception() noexcept
 {
 }
diff --git a/src/bases/Exception.hxx b/src/bases/Exception.hxx
index 7564c0fbf..ac4aada00 100644
--- a/src/bases/Exception.hxx
+++ b/src/bases/Exception.hxx
@@ -33,8 +33,8 @@ namespace YACS
     std::string _what;
   public:
     Exception(const std::string& what,int errNumber=0);
-    const char *what( void ) const throw ();
-    virtual ~Exception() throw ();
+    const char *what( void ) const noexcept;
+    virtual ~Exception() noexcept;
     int errNumber;
   };
 }
diff --git a/src/engine/ConversionException.cxx b/src/engine/ConversionException.cxx
index 01da08e44..8f13bd570 100644
--- a/src/engine/ConversionException.cxx
+++ b/src/engine/ConversionException.cxx
@@ -31,6 +31,6 @@ ConversionException::ConversionException(const std::string& what,bool prefix):Ex
   _what+=what;
 }
 
-ConversionException::~ConversionException() throw ()
+ConversionException::~ConversionException() noexcept
 {
 }
diff --git a/src/engine/ConversionException.hxx b/src/engine/ConversionException.hxx
index 6b6c5bcdc..7f3692302 100644
--- a/src/engine/ConversionException.hxx
+++ b/src/engine/ConversionException.hxx
@@ -33,7 +33,7 @@ namespace YACS
     {
     public:
       ConversionException(const std::string& what,bool prefix=true);
-      virtual ~ConversionException() throw();
+      virtual ~ConversionException() noexcept;
     private:
       static const char TYPEOFEXCEPTION[];
     };
diff --git a/src/engine/ForEachLoop.cxx b/src/engine/ForEachLoop.cxx
index d3bc13f27..f8c067133 100644
--- a/src/engine/ForEachLoop.cxx
+++ b/src/engine/ForEachLoop.cxx
@@ -28,6 +28,7 @@
 #include <iomanip>
 #include <sstream>
 #include <algorithm>    // std::replace_if
+#include <functional>   // std::bind
 
 //#define _DEVDEBUG_
 #include "YacsTrace.hxx"
@@ -909,7 +910,7 @@ YACS::Event ForEachLoopGen::updateStateOnFailedEventFrom(Node *node, const Execu
 
 void ForEachLoopGen::InterceptorizeNameOfPort(std::string& portName)
 {
-  std::replace_if(portName.begin(), portName.end(), std::bind1st(std::equal_to<char>(), '.'), '_');
+  std::replace_if(portName.begin(), portName.end(), std::bind(std::equal_to<char>(), '.',std::placeholders::_1), '_');
   portName += INTERCEPTOR_STR;
 }
 
diff --git a/src/py2yacs/py2yacs.cxx b/src/py2yacs/py2yacs.cxx
index 479e8ee9f..9413481c1 100644
--- a/src/py2yacs/py2yacs.cxx
+++ b/src/py2yacs/py2yacs.cxx
@@ -32,11 +32,11 @@ Py2yacsException::Py2yacsException(const std::string& what)
 {
 }
 
-Py2yacsException::~Py2yacsException()throw ()
+Py2yacsException::~Py2yacsException() noexcept
 {
 }
 
-const char * Py2yacsException::what() const throw ()
+const char * Py2yacsException::what() const noexcept
 {
   return _what.c_str();
 }
diff --git a/src/py2yacs/py2yacs.hxx b/src/py2yacs/py2yacs.hxx
index a6d1e9b80..039f4443b 100644
--- a/src/py2yacs/py2yacs.hxx
+++ b/src/py2yacs/py2yacs.hxx
@@ -38,8 +38,8 @@ class PY2YACSLIB_EXPORT Py2yacsException: std::exception
 {
   public:
     Py2yacsException(const std::string& what);
-    virtual ~Py2yacsException()throw ();
-    virtual const char *what() const throw ();
+    virtual ~Py2yacsException() noexcept;
+    virtual const char *what() const noexcept;
   private:
     std::string _what;
 };
-- 
2.39.2