diff options
| author |   Unit 193 <unit193@unit193.net> | 2020-07-21 06:15:16 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2020-07-21 06:15:16 -0400 |
| commit | 37a7155ea7c504b308a8afa642c653a12bbe5f84 (patch) | |
| tree | bd68ea5d2a2400dcd04b1aa85617534e66aba94c /src/lib/net/NetworkAddress.cpp | |
| parent | 1ae09e76cde035d716763fc88b570535884cd50f (diff) | |
| parent | fbc30002ab3438356c0476e70c4577a0310d52c0 (diff) | |
Update upstream source from tag 'upstream/2.3.3+dfsg'
Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f
Diffstat (limited to 'src/lib/net/NetworkAddress.cpp')
| -rw-r--r-- | src/lib/net/NetworkAddress.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/net/NetworkAddress.cpp b/src/lib/net/NetworkAddress.cpp index 8d60567..c8ea9c6 100644 --- a/src/lib/net/NetworkAddress.cpp +++ b/src/lib/net/NetworkAddress.cpp @@ -96,7 +96,7 @@ NetworkAddress::NetworkAddress(const NetworkAddress& addr) : // do nothing } -NetworkAddress::NetworkAddress(const String& hostname, int port) : +NetworkAddress::NetworkAddress(const std::string& hostname, int port) : m_address(NULL), m_hostname(hostname), m_port(port) @@ -196,8 +196,7 @@ NetworkAddress::getPort() const return m_port; } -String -NetworkAddress::getHostname() const +std::string NetworkAddress::getHostname() const { return m_hostname; } |