diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-11-29 19:30:06 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-12-16 23:28:43 +0000 |
| commit | bb89ae8b2058d98a764f24e17e6c58089dd548f0 (patch) | |
| tree | 345e5fba3b63920cb4b06d3d2553f580932684d9 /contrib/epee/include/net | |
| parent | cryptonote_core does not depend on p2p anymore (diff) | |
| download | monero-bb89ae8b2058d98a764f24e17e6c58089dd548f0.tar.xz | |
move connection_basic and network_throttle from src/p2p to epee
These even had the epee namespace.
This fixes some ugly circular dependencies.
Diffstat (limited to '')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.h | 4 | ||||
| -rw-r--r-- | contrib/epee/include/net/connection_basic.hpp (renamed from src/p2p/connection_basic.hpp) | 0 | ||||
| -rw-r--r-- | contrib/epee/include/net/network_throttle-detail.hpp (renamed from src/p2p/network_throttle-detail.hpp) | 4 | ||||
| -rw-r--r-- | contrib/epee/include/net/network_throttle.hpp (renamed from src/p2p/network_throttle.hpp) | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h index 33fec8ec5..c0401c8b0 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.h +++ b/contrib/epee/include/net/abstract_tcp_server2.h @@ -54,8 +54,8 @@ #include <boost/thread/thread.hpp> #include "net_utils_base.h" #include "syncobj.h" -#include "../../../../src/p2p/connection_basic.hpp" -#include "../../../../src/p2p/network_throttle-detail.hpp" +#include "connection_basic.hpp" +#include "network_throttle-detail.hpp" #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "net" diff --git a/src/p2p/connection_basic.hpp b/contrib/epee/include/net/connection_basic.hpp index 16de469a7..16de469a7 100644 --- a/src/p2p/connection_basic.hpp +++ b/contrib/epee/include/net/connection_basic.hpp diff --git a/src/p2p/network_throttle-detail.hpp b/contrib/epee/include/net/network_throttle-detail.hpp index 676d4341a..dba15a5ed 100644 --- a/src/p2p/network_throttle-detail.hpp +++ b/contrib/epee/include/net/network_throttle-detail.hpp @@ -33,8 +33,8 @@ /* rfree: throttle details, implementing rate limiting */ -#ifndef INCLUDED_src_p2p_throttle_detail_hpp -#define INCLUDED_src_p2p_throttle_detail_hpp +#ifndef INCLUDED_throttle_detail_hpp +#define INCLUDED_throttle_detail_hpp #include "network_throttle.hpp" diff --git a/src/p2p/network_throttle.hpp b/contrib/epee/include/net/network_throttle.hpp index bf1f93859..464b34726 100644 --- a/src/p2p/network_throttle.hpp +++ b/contrib/epee/include/net/network_throttle.hpp @@ -34,8 +34,8 @@ /* rfree: also includes the manager for singeton/global such objects */ -#ifndef INCLUDED_p2p_network_throttle_hpp -#define INCLUDED_p2p_network_throttle_hpp +#ifndef INCLUDED_network_throttle_hpp +#define INCLUDED_network_throttle_hpp #include <boost/asio.hpp> #include <string> |