#18963 Change throw() -> noexcept

diff --git a/src/bases/AutoRefCnt.hxx b/src/bases/AutoRefCnt.hxx
index 480a693c52ac58a5a5ba1d0977d1b85bf894695c..589a10bc2debb532e4f4dfbc0f6889d034b874e3 100644 (file)
--- 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 48ec735a64840e50a6d5fa80dbb7aa1a5e76d2de..f8cf8af68693bc2c0125c7757843eecb82f66728 100644 (file)
--- 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 7564c0fbfa36d2bd1f0eeb826f49ffadddc839eb..ac4aada00281fbe48659b8816fbf4cea348969aa 100644 (file)
--- 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 01da08e4448df691bb35b6794d03cdaa5f83a145..8f13bd5703fab669e82d6926281daae73b1cbdbf 100644 (file)
--- 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 6b6c5bcdca5ce97b3241e8cf72e111a5685d44f7..7f36923029be93102dc584a2b06ea4908f69050c 100644 (file)
--- 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 d3bc13f27027ef5d113869412978ab9d77615138..f8c06713302785bde4a0694bcdaeb329175f07fe 100644 (file)
--- 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 479e8ee9f0232da4eaacd20e78279048911447f2..9413481c1eb6d3a36ba054ab9217d6f1bcbfabed 100644 (file)
--- 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 a6d1e9b80948607992fb96655b8aa38d9d8897c6..039f4443b45675f6c1c4a55e64fb88f04e63d796 100644 (file)
--- 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;
 };