diff -r 20ca0a6be175 -r 9b6a0daedfc0 sources/network/ipaddress.cpp --- a/sources/network/ipaddress.cpp Wed Jan 27 14:04:53 2021 +0200 +++ b/sources/network/ipaddress.cpp Wed Jan 27 14:05:39 2021 +0200 @@ -66,9 +66,9 @@ // ----------------------------------------------------------------------------- // -String IPAddress::to_string (WithPort withport) const +std::string IPAddress::to_string (WithPort withport) const { - String val; + std::string val; if (withport == WITH_PORT) val = sprintf ("%u.%u.%u.%u:%u", octet (0), octet (1), octet (2), octet (3), port); @@ -141,11 +141,11 @@ // ----------------------------------------------------------------------------- // -IPAddress IPAddress::from_string (String input) +IPAddress IPAddress::from_string (std::string input) { unsigned int parts[4]; int colonpos = input.find (":"); - String addressString = colonpos == -1 ? input : mid(input, 0, colonpos); + std::string addressString = colonpos == -1 ? input : mid(input, 0, colonpos); IPAddress value; // Try scanf the IPv4 host first @@ -174,7 +174,7 @@ // ----------------------------------------------------------------------------- // -IPAddress IPAddress::resolve (String node) +IPAddress IPAddress::resolve (std::string node) { AddrInfo hints; AddrInfo* lookup;