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 /src/p2p | |
| 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/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 | ||||
| -rw-r--r-- | contrib/epee/src/connection_basic.cpp (renamed from src/p2p/connection_basic.cpp) | 4 | ||||
| -rw-r--r-- | contrib/epee/src/network_throttle-detail.cpp (renamed from src/p2p/network_throttle-detail.cpp) | 2 | ||||
| -rw-r--r-- | contrib/epee/src/network_throttle.cpp (renamed from src/p2p/network_throttle.cpp) | 2 |
6 files changed, 8 insertions, 8 deletions
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> diff --git a/src/p2p/connection_basic.cpp b/contrib/epee/src/connection_basic.cpp index 06baa7893..534044a79 100644 --- a/src/p2p/connection_basic.cpp +++ b/contrib/epee/src/connection_basic.cpp @@ -32,7 +32,7 @@ /* rfree: implementation for the non-template base, can be used by connection<> template class in abstract_tcp_server2 file */ -#include "connection_basic.hpp" +#include "net/connection_basic.hpp" #include <boost/asio.hpp> #include <string> @@ -77,7 +77,7 @@ #include "net/abstract_tcp_server2.h" // TODO: -#include "network_throttle-detail.hpp" +#include "net/network_throttle-detail.hpp" #include "cryptonote_core/cryptonote_core.h" #undef MONERO_DEFAULT_LOG_CATEGORY diff --git a/src/p2p/network_throttle-detail.cpp b/contrib/epee/src/network_throttle-detail.cpp index 651e01e6b..317dde8e0 100644 --- a/src/p2p/network_throttle-detail.cpp +++ b/contrib/epee/src/network_throttle-detail.cpp @@ -74,7 +74,7 @@ #include "net/abstract_tcp_server2.h" // TODO: -#include "network_throttle-detail.hpp" +#include "net/network_throttle-detail.hpp" #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "net.throttle" diff --git a/src/p2p/network_throttle.cpp b/contrib/epee/src/network_throttle.cpp index 74b20376d..afacc3e96 100644 --- a/src/p2p/network_throttle.cpp +++ b/contrib/epee/src/network_throttle.cpp @@ -54,7 +54,7 @@ Throttling work by: // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "network_throttle-detail.hpp" +#include "net/network_throttle-detail.hpp" namespace epee { |