Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-01 20:36:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2234

Browse source 
214fd81e some include cleanup (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-07 15:13:07 +02:00
commit ea46a5527a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
17 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
View file

@ -49,8 +49,8 @@
#include "syncobj.h"
#include "../../contrib/epee/include/net/net_utils_base.h"
#include "../../contrib/epee/include/misc_log_ex.h"
#include "net/net_utils_base.h"
#include "misc_log_ex.h"
#include <boost/lambda/bind.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/uuid/random_generator.hpp>
@ -69,10 +69,10 @@
#include <boost/asio/basic_socket.hpp>
#include <boost/asio/ip/unicast.hpp>
#include "../../src/cryptonote_protocol/cryptonote_protocol_handler.h"
#include "../../src/p2p/network_throttle.hpp"
#include "cryptonote_protocol_handler.h"
#include "p2p/network_throttle.hpp"
#include "../../../src/cryptonote_core/cryptonote_core.h" // e.g. for the send_stop_signal()
#include "cryptonote_core/cryptonote_core.h" // e.g. for the send_stop_signal()
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.cn"

2
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -41,7 +41,7 @@
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "profile_tools.h"
#include "../../src/p2p/network_throttle-detail.hpp"
#include "p2p/network_throttle-detail.hpp"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.cn"