aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/blockchain_db/blockchain_db.cpp1
-rw-r--r--src/blockchain_db/lmdb/db_lmdb.cpp1
-rw-r--r--src/common/dns_utils.h1
-rw-r--r--src/common/stack_trace.cpp5
-rw-r--r--src/common/stack_trace.h1
-rw-r--r--src/cryptonote_basic/cryptonote_format_utils.h1
-rw-r--r--src/cryptonote_core/cryptonote_tx_utils.h1
-rw-r--r--src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp10
-rw-r--r--src/cryptonote_protocol/cryptonote_protocol_handler.inl2
-rw-r--r--src/daemon/daemon.cpp2
-rw-r--r--src/p2p/connection_basic.cpp10
-rw-r--r--src/p2p/connection_basic.hpp4
-rw-r--r--src/p2p/network_throttle-detail.cpp8
-rw-r--r--src/p2p/network_throttle-detail.hpp2
-rw-r--r--src/p2p/network_throttle.cpp2
-rw-r--r--src/p2p/network_throttle.hpp4
-rw-r--r--src/p2p/p2p_protocol_defs.h2
17 files changed, 30 insertions, 27 deletions
diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp
index 136d4fa80..a6774a25c 100644
--- a/src/blockchain_db/blockchain_db.cpp
+++ b/src/blockchain_db/blockchain_db.cpp
@@ -31,6 +31,7 @@
#include "blockchain_db.h"
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "profile_tools.h"
+#include "ringct/rctOps.h"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "blockchain.db"
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index 6bb96d1db..0073ddf54 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -37,6 +37,7 @@
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "crypto/crypto.h"
#include "profile_tools.h"
+#include "ringct/rctOps.h"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "blockchain.db.lmdb"
diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h
index 69b32f435..61e1358ca 100644
--- a/src/common/dns_utils.h
+++ b/src/common/dns_utils.h
@@ -29,7 +29,6 @@
#include <vector>
#include <string>
-#include "cryptonote_basic/cryptonote_basic.h"
namespace tools
{
diff --git a/src/common/stack_trace.cpp b/src/common/stack_trace.cpp
index ef64c20c5..6fdf4dd47 100644
--- a/src/common/stack_trace.cpp
+++ b/src/common/stack_trace.cpp
@@ -30,8 +30,7 @@
#define USE_UNWIND
#endif
-#include "common/stack_trace.h"
-#include "misc_log_ex.h"
+#include <stdexcept>
#ifdef USE_UNWIND
#define UNW_LOCAL_ONLY
#include <libunwind.h>
@@ -40,6 +39,8 @@
#ifndef STATICLIB
#include <dlfcn.h>
#endif
+#include "common/stack_trace.h"
+#include "misc_log_ex.h"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "stacktrace"
diff --git a/src/common/stack_trace.h b/src/common/stack_trace.h
index 25eec9fb3..0f6bdc08b 100644
--- a/src/common/stack_trace.h
+++ b/src/common/stack_trace.h
@@ -29,7 +29,6 @@
#ifndef MONERO_EXCEPTION_H
#define MONERO_EXCEPTION_H
-#include <stdexcept>
#include <string>
namespace tools
diff --git a/src/cryptonote_basic/cryptonote_format_utils.h b/src/cryptonote_basic/cryptonote_format_utils.h
index 5c10907fd..d8ccf8eec 100644
--- a/src/cryptonote_basic/cryptonote_format_utils.h
+++ b/src/cryptonote_basic/cryptonote_format_utils.h
@@ -35,7 +35,6 @@
#include "include_base_utils.h"
#include "crypto/crypto.h"
#include "crypto/hash.h"
-#include "ringct/rctOps.h"
namespace cryptonote
{
diff --git a/src/cryptonote_core/cryptonote_tx_utils.h b/src/cryptonote_core/cryptonote_tx_utils.h
index 933070e1e..7aa7c280d 100644
--- a/src/cryptonote_core/cryptonote_tx_utils.h
+++ b/src/cryptonote_core/cryptonote_tx_utils.h
@@ -32,6 +32,7 @@
#include "cryptonote_basic/cryptonote_format_utils.h"
#include <boost/serialization/vector.hpp>
#include <boost/serialization/utility.hpp>
+#include "ringct/rctOps.h"
namespace cryptonote
{
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp b/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
index e31276031..cb4ec41af 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
@@ -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"
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 3dfe86fe1..edf041f48 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -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"
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 241cb3883..683eaf4ff 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -41,7 +41,7 @@
#include "daemon/rpc.h"
#include "daemon/command_server.h"
#include "version.h"
-#include "../../contrib/epee/include/syncobj.h"
+#include "syncobj.h"
using namespace epee;
diff --git a/src/p2p/connection_basic.cpp b/src/p2p/connection_basic.cpp
index df34379e2..d4fbc79e1 100644
--- a/src/p2p/connection_basic.cpp
+++ b/src/p2p/connection_basic.cpp
@@ -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"
diff --git a/src/p2p/connection_basic.hpp b/src/p2p/connection_basic.hpp
index bea2df1cd..16de469a7 100644
--- a/src/p2p/connection_basic.hpp
+++ b/src/p2p/connection_basic.hpp
@@ -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
{
diff --git a/src/p2p/network_throttle-detail.cpp b/src/p2p/network_throttle-detail.cpp
index 0747b6f36..1df48ee26 100644
--- a/src/p2p/network_throttle-detail.cpp
+++ b/src/p2p/network_throttle-detail.cpp
@@ -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"
diff --git a/src/p2p/network_throttle-detail.hpp b/src/p2p/network_throttle-detail.hpp
index c514db450..27caa85d3 100644
--- a/src/p2p/network_throttle-detail.hpp
+++ b/src/p2p/network_throttle-detail.hpp
@@ -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
{
diff --git a/src/p2p/network_throttle.cpp b/src/p2p/network_throttle.cpp
index 18148fd6a..74b20376d 100644
--- a/src/p2p/network_throttle.cpp
+++ b/src/p2p/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 "../../src/p2p/network_throttle-detail.hpp"
+#include "network_throttle-detail.hpp"
namespace epee
{
diff --git a/src/p2p/network_throttle.hpp b/src/p2p/network_throttle.hpp
index 81d77d5c0..9853df5e1 100644
--- a/src/p2p/network_throttle.hpp
+++ b/src/p2p/network_throttle.hpp
@@ -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>
diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h
index d8932a1df..f38615def 100644
--- a/src/p2p/p2p_protocol_defs.h
+++ b/src/p2p/p2p_protocol_defs.h
@@ -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
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 14:44:59 +0000