diff -r 20ca0a6be175 -r 9b6a0daedfc0 sources/network/ipaddress.h --- a/sources/network/ipaddress.h Wed Jan 27 14:04:53 2021 +0200 +++ b/sources/network/ipaddress.h Wed Jan 27 14:05:39 2021 +0200 @@ -51,10 +51,10 @@ class StringParseError : public std::exception { - String m_message; + std::string m_message; public: - StringParseError (String message) : + StringParseError (std::string message) : m_message (message) {} const char* what() const throw() @@ -73,15 +73,15 @@ bool compare (const IPAddress& other) const; unsigned char octet (int n) const; void set_octet (int n, unsigned char oct); - String to_string (WithPort withport = NO_PORT) const; + std::string to_string (WithPort withport = NO_PORT) const; sockaddr_in to_sockaddr_in() const; bool operator< (const IPAddress& other) const; bool operator== (const IPAddress& other) const { return compare (other); } bool operator!= (const IPAddress& other) const { return not compare (other); } unsigned char operator[] (int n) const { return octet (n); } - static IPAddress from_string (String input); - static IPAddress resolve (String node); + static IPAddress from_string (std::string input); + static IPAddress resolve (std::string node); }; END_ZFC_NAMESPACE