Update upstream source from tag 'upstream/2.3.3+dfsg'

Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f

1 files changed, 16 insertions, 18 deletions

diff --git a/src/lib/barrier/XBarrier.h b/src/lib/barrier/XBarrier.h
index fdf5213..fef931e 100644
--- a/src/lib/barrier/XBarrier.h
+++ b/src/lib/barrier/XBarrier.h
@@ -47,14 +47,14 @@ public:
     //@{
 
     //! Get client's major version number
-    int                    getMajor() const throw();
+    int getMajor() const noexcept;
     //! Get client's minor version number
-    int                    getMinor() const throw();
+    int getMinor() const noexcept;
 
     //@}
 
 protected:
-    virtual String        getWhat() const throw();
+    virtual std::string getWhat() const noexcept;
 
 private:
     int                    m_major;
@@ -68,23 +68,22 @@ a client that is already connected.
 */
 class XDuplicateClient : public XBarrier {
 public:
-    XDuplicateClient(const String& name);
-    virtual ~XDuplicateClient() _NOEXCEPT { }
+    XDuplicateClient(const std::string& name);
+    virtual ~XDuplicateClient() noexcept { }
 
     //! @name accessors
     //@{
 
     //! Get client's name
-    virtual const String&
-                        getName() const throw();
+    virtual const std::string& getName() const noexcept;
 
     //@}
 
 protected:
-    virtual String        getWhat() const throw();
+    virtual std::string getWhat() const noexcept;
 
 private:
-    String                m_name;
+    std::string m_name;
 };
 
 //! Client not in map exception
@@ -94,23 +93,22 @@ unknown to the server.
 */
 class XUnknownClient : public XBarrier {
 public:
-    XUnknownClient(const String& name);
-    virtual ~XUnknownClient() _NOEXCEPT { }
+    XUnknownClient(const std::string& name);
+    virtual ~XUnknownClient() noexcept { }
 
     //! @name accessors
     //@{
 
     //! Get the client's name
-    virtual const String&
-                        getName() const throw();
+    virtual const std::string& getName() const noexcept;
 
     //@}
 
 protected:
-    virtual String        getWhat() const throw();
+    virtual std::string getWhat() const noexcept;
 
 private:
-    String                m_name;
+    std::string                m_name;
 };
 
 //! Generic exit eception
@@ -122,13 +120,13 @@ exit(int).
 class XExitApp : public XBarrier {
 public:
     XExitApp(int code);
-    virtual ~XExitApp() _NOEXCEPT { }
+    virtual ~XExitApp() noexcept { }
 
     //! Get the exit code
-    int getCode() const throw();
+    int getCode() const noexcept;
 
 protected:
-    virtual String    getWhat() const throw();
+    virtual std::string getWhat() const noexcept;
     
 private:
     int    m_code;