New upstream version 2.3.3+dfsg.upstream/2.3.3+dfsg

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/barrier/ProtocolUtil.h b/src/lib/barrier/ProtocolUtil.h
index 78bb5ca..9930cfc 100644
--- a/src/lib/barrier/ProtocolUtil.h
+++ b/src/lib/barrier/ProtocolUtil.h
@@ -47,7 +47,7 @@ public:
     - \%1I  -- converts std::vector<UInt8>* to 1 byte integers
     - \%2I  -- converts std::vector<UInt16>* to 2 byte integers in NBO
     - \%4I  -- converts std::vector<UInt32>* to 4 byte integers in NBO
-    - \%s   -- converts String* to stream of bytes
+    - \%s   -- converts std::string* to stream of bytes
     - \%S   -- converts integer N and const UInt8* to stream of N bytes
     */
     static void            writef(barrier::IStream*,
@@ -67,7 +67,7 @@ public:
     - \%1I  -- reads 1 byte integers;  arg is std::vector<UInt8>*
     - \%2I  -- reads NBO 2 byte integers;  arg is std::vector<UInt16>*
     - \%4I  -- reads NBO 4 byte integers;  arg is std::vector<UInt32>*
-    - \%s   -- reads bytes;  argument must be a String*, \b not a char*
+    - \%s   -- reads bytes;  argument must be a std::string*, \b not a char*
     */
     static bool            readf(barrier::IStream*,
                             const char* fmt, ...);
@@ -92,5 +92,5 @@ match the format.
 class XIOReadMismatch : public XIO {
 public:
     // XBase overrides
-    virtual String        getWhat() const throw();
+    virtual std::string getWhat() const noexcept;
 };