diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-01-16 19:27:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-01-16 19:27:13 +0200 |
| commit | 3e9bb9626a16be6c3946e532ab9fa8c7b7090471 (patch) | |
| tree | b403e7ac10322cf14f84b183b77aece7ac23ef62 /contrib/epee/src | |
| parent | Merge pull request #4995 (diff) | |
| parent | Remove boost::lexical_cast for uuid and unused uuid function (diff) | |
| download | monero-3e9bb9626a16be6c3946e532ab9fa8c7b7090471.tar.xz | |
Merge pull request #5001
a5ffc2d5 Remove boost::lexical_cast for uuid and unused uuid function (Lee Clagett)
Diffstat (limited to 'contrib/epee/src')
| -rw-r--r-- | contrib/epee/src/net_utils_base.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/epee/src/net_utils_base.cpp b/contrib/epee/src/net_utils_base.cpp index 354c3d2c3..263b344b4 100644 --- a/contrib/epee/src/net_utils_base.cpp +++ b/contrib/epee/src/net_utils_base.cpp @@ -1,7 +1,9 @@ #include "net/net_utils_base.h" -#include "string_tools.h" +#include <boost/uuid/uuid_io.hpp> + +#include "string_tools.h" #include "net/local_ip.h" namespace epee { namespace net_utils @@ -73,7 +75,7 @@ namespace epee { namespace net_utils std::string print_connection_context(const connection_context_base& ctx) { std::stringstream ss; - ss << ctx.m_remote_address.str() << " " << epee::string_tools::get_str_from_guid_a(ctx.m_connection_id) << (ctx.m_is_income ? " INC":" OUT"); + ss << ctx.m_remote_address.str() << " " << ctx.m_connection_id << (ctx.m_is_income ? " INC":" OUT"); return ss.str(); } |