Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-11-28 07:30:30 -05: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/p2p/connection_basic.cpp
View file

@ -53,8 +53,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>
@ -74,11 +74,11 @@
#include <boost/asio/basic_socket.hpp>
#include <boost/asio/ip/unicast.hpp>
#include "../../contrib/epee/include/net/abstract_tcp_server2.h"
#include "net/abstract_tcp_server2.h"
// TODO:
#include "../../src/p2p/network_throttle-detail.hpp"
#include "../../src/cryptonote_core/cryptonote_core.h"
#include "network_throttle-detail.hpp"
#include "cryptonote_core/cryptonote_core.h"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"

4
src/p2p/connection_basic.hpp
View file

@ -59,8 +59,8 @@
#include <memory>
#include "../../contrib/epee/include/net/net_utils_base.h"
#include "../../contrib/epee/include/syncobj.h"
#include "net/net_utils_base.h"
#include "syncobj.h"
namespace epee
{

8
src/p2p/network_throttle-detail.cpp
View file

@ -51,8 +51,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>
@ -71,10 +71,10 @@
#include <boost/asio/basic_socket.hpp>
#include <boost/asio/ip/unicast.hpp>
#include "../../contrib/epee/include/net/abstract_tcp_server2.h"
#include "net/abstract_tcp_server2.h"
// TODO:
#include "../../src/p2p/network_throttle-detail.hpp"
#include "network_throttle-detail.hpp"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.throttle"

2
src/p2p/network_throttle-detail.hpp
View file

@ -36,7 +36,7 @@
#ifndef INCLUDED_src_p2p_throttle_detail_hpp
#define INCLUDED_src_p2p_throttle_detail_hpp
#include "../../src/p2p/network_throttle.hpp"
#include "network_throttle.hpp"
namespace epee
{

2
src/p2p/network_throttle.cpp
View file

@ -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 "../../src/p2p/network_throttle-detail.hpp"
#include "network_throttle-detail.hpp"
namespace epee
{

4
src/p2p/network_throttle.hpp
View file

@ -54,8 +54,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>

2
src/p2p/p2p_protocol_defs.h
View file

@ -35,7 +35,9 @@
#include "net/net_utils_base.h"
#include "misc_language.h"
#include "cryptonote_config.h"
#ifdef ALLOW_DEBUG_COMMANDS
#include "crypto/crypto.h"
#endif
namespace nodetool
{