diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:59:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:59:44 +0200 |
| commit | 066fd7aced8ff0079271bae1295355d741f2ea7b (patch) | |
| tree | e8056ad1f87ed1d9fc695e68c87bb5adc2700d52 /contrib/epee/src/connection_basic.cpp | |
| parent | Merge pull request #2864 (diff) | |
| parent | Wallets now do not depend on the daemon rpc lib (diff) | |
| download | monero-066fd7aced8ff0079271bae1295355d741f2ea7b.tar.xz | |
Merge pull request #2877
43f5269f Wallets now do not depend on the daemon rpc lib (moneromooo-monero)
bb89ae8b move connection_basic and network_throttle from src/p2p to epee (moneromooo-monero)
4abf25f3 cryptonote_core does not depend on p2p anymore (moneromooo-monero)
Diffstat (limited to '')
| -rw-r--r-- | contrib/epee/src/connection_basic.cpp (renamed from src/p2p/connection_basic.cpp) | 4 |
1 files changed, 2 insertions, 2 deletions
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 |