From fac9e35dfbc3015b3f4a7664a97861f1dc40edf6 Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Tue, 10 Mar 2015 12:37:30 +0100 Subject: [PATCH] Remove StructuredLogger dependency on libp2p --- libdevcore/StructuredLogger.cpp | 3 ++- libdevcore/StructuredLogger.h | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libdevcore/StructuredLogger.cpp b/libdevcore/StructuredLogger.cpp index d93a9496e..ff267ff4e 100644 --- a/libdevcore/StructuredLogger.cpp +++ b/libdevcore/StructuredLogger.cpp @@ -22,11 +22,12 @@ */ #include "StructuredLogger.h" - #include +#include #include #include "Guards.h" +namespace ba = boost::asio; using namespace std; namespace dev diff --git a/libdevcore/StructuredLogger.h b/libdevcore/StructuredLogger.h index 58b408ede..eea19d107 100644 --- a/libdevcore/StructuredLogger.h +++ b/libdevcore/StructuredLogger.h @@ -27,9 +27,10 @@ #include #include -#include namespace Json { class Value; } +namespace boost { namespace asio { namespace ip { templateclass basic_endpoint; class tcp; }}} +namespace bi = boost::asio::ip; namespace dev { @@ -61,12 +62,16 @@ public: static void stopping(std::string const& _clientImpl, const char* _ethVersion); static void p2pConnected( std::string const& _id, - bi::tcp::endpoint const& _addr, + bi::basic_endpoint const& _addr, std::chrono::system_clock::time_point const& _ts, std::string const& _remoteVersion, unsigned int _numConnections ); - static void p2pDisconnected(std::string const& _id, bi::tcp::endpoint const& _addr, unsigned int _numConnections); + static void p2pDisconnected( + std::string const& _id, + bi::basic_endpoint const& _addr, + unsigned int _numConnections + ); static void minedNewBlock( std::string const& _hash, std::string const& _blockNumber,