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, 3 insertions, 4 deletions

diff --git a/src/lib/net/NetworkAddress.h b/src/lib/net/NetworkAddress.h
index cbd15f5..87dc1e4 100644
--- a/src/lib/net/NetworkAddress.h
+++ b/src/lib/net/NetworkAddress.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "base/String.h"
 #include "base/EventTypes.h"
 #include "arch/IArchNetwork.h"
 
@@ -49,7 +48,7 @@ public:
     is thrown with an error of \c XSocketAddress::kBadPort.  The hostname
     is not resolved by the c'tor;  use \c resolve to do that.
     */
-    NetworkAddress(const String& hostname, int port);
+    NetworkAddress(const std::string& hostname, int port);
 
     NetworkAddress(const NetworkAddress&);
 
@@ -109,7 +108,7 @@ public:
     /*!
     Returns the hostname passed to the c'tor sans any port suffix.
     */
-    String                getHostname() const;
+    std::string getHostname() const;
 
     //@}
 
@@ -118,6 +117,6 @@ private:
 
 private:
     ArchNetAddress        m_address;
-    String                m_hostname;
+    std::string m_hostname;
     int                    m_port;
 };