Merge pull request #2234

214fd81e some include cleanup (moneromooo-monero)

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"

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"

src/common/dns_utils.h

@@ -29,7 +29,6 @@
 
 #include <vector>
 #include <string>
-#include "cryptonote_basic/cryptonote_basic.h"
 
 namespace tools
 {

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"

src/common/stack_trace.h

@@ -29,7 +29,6 @@
 #ifndef MONERO_EXCEPTION_H
 #define MONERO_EXCEPTION_H
 
-#include <stdexcept>
 #include <string>
 
 namespace tools

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
 {

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
 {

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"

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"

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;
 

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"

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
 {

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"

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
 {

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
 {

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>

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
 {