diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-06-18 14:23:59 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-06-18 14:23:59 +0200 |
| commit | a237f90c5be32adb125edfa76954adefea09674b (patch) | |
| tree | b1041ada449f6d9d127e83ddc71c728ca7e07a1c /contrib/epee/include/string_tools.h | |
| parent | Merge pull request #2059 (diff) | |
| parent | abstracted nework addresses (diff) | |
| download | monero-a237f90c5be32adb125edfa76954adefea09674b.tar.xz | |
Merge pull request #2052
072102cf abstracted nework addresses (moneromooo-monero)
Diffstat (limited to 'contrib/epee/include/string_tools.h')
| -rw-r--r-- | contrib/epee/include/string_tools.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/epee/include/string_tools.h b/contrib/epee/include/string_tools.h index 16e60e99a..258caa49e 100644 --- a/contrib/epee/include/string_tools.h +++ b/contrib/epee/include/string_tools.h @@ -193,7 +193,7 @@ POP_WARNINGS //---------------------------------------------------------------------------- bool get_ip_int32_from_string(uint32_t& ip, const std::string& ip_str); //---------------------------------------------------------------------------- - inline bool parse_peer_from_string(uint32_t& ip, uint32_t& port, const std::string& addres) + inline bool parse_peer_from_string(uint32_t& ip, uint16_t& port, const std::string& addres) { //parse ip and address std::string::size_type p = addres.find(':'); |