diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-07-19 03:34:27 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-07-19 03:34:28 -0700 |
| commit | 3ba6c7fd30302cfb38f8af0618504dbf1fb17f09 (patch) | |
| tree | ee889c2e7335d49ee67c413f5d18576bbff12b40 | |
| parent | Merge pull request #6512 (diff) | |
| parent | remove double includes (diff) | |
| download | monero-3ba6c7fd30302cfb38f8af0618504dbf1fb17f09.tar.xz | |
Merge pull request #6516
8656a8c9f remove double includes (sumogr)
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.h | 3 | ||||
| -rw-r--r-- | contrib/epee/include/net/network_throttle.hpp | 4 | ||||
| -rw-r--r-- | src/daemon/daemon.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/message_transporter.h | 1 | ||||
| -rw-r--r-- | tests/core_proxy/core_proxy.cpp | 1 | ||||
| -rw-r--r-- | tests/unit_tests/mnemonics.cpp | 2 |
6 files changed, 0 insertions, 12 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h index 3a2c5341d..3c31cf22b 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.h +++ b/contrib/epee/include/net/abstract_tcp_server2.h @@ -48,12 +48,9 @@ #include <boost/asio.hpp> #include <boost/asio/ssl.hpp> #include <boost/array.hpp> -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> //! \TODO Convert to std::shared_ptr #include <boost/enable_shared_from_this.hpp> #include <boost/interprocess/detail/atomic.hpp> #include <boost/thread/thread.hpp> -#include <memory> #include "byte_slice.h" #include "net_utils_base.h" #include "syncobj.h" diff --git a/contrib/epee/include/net/network_throttle.hpp b/contrib/epee/include/net/network_throttle.hpp index 2be6a8fc4..b6f7592c2 100644 --- a/contrib/epee/include/net/network_throttle.hpp +++ b/contrib/epee/include/net/network_throttle.hpp @@ -44,10 +44,7 @@ #include <boost/shared_ptr.hpp> #include <atomic> -#include <boost/asio.hpp> #include <boost/array.hpp> -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include <boost/interprocess/detail/atomic.hpp> #include <boost/thread/thread.hpp> @@ -63,7 +60,6 @@ #include <boost/utility/value_init.hpp> #include <boost/asio/deadline_timer.hpp> #include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/thread/thread.hpp> #include "misc_language.h" #include "pragma_comp_defs.h" #include <sstream> diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index 94696b141..96db8712b 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -43,7 +43,6 @@ #include "daemon/protocol.h" #include "daemon/rpc.h" #include "daemon/command_server.h" -#include "daemon/command_server.h" #include "daemon/command_line_args.h" #include "net/net_ssl.h" #include "version.h" diff --git a/src/wallet/message_transporter.h b/src/wallet/message_transporter.h index 84a2e9bae..557833f2c 100644 --- a/src/wallet/message_transporter.h +++ b/src/wallet/message_transporter.h @@ -31,7 +31,6 @@ #include "cryptonote_basic/cryptonote_basic.h" #include "cryptonote_basic/cryptonote_boost_serialization.h" #include "cryptonote_basic/account_boost_serialization.h" -#include "cryptonote_basic/cryptonote_basic.h" #include "net/http_server_impl_base.h" #include "net/http_client.h" #include "net/abstract_http_client.h" diff --git a/tests/core_proxy/core_proxy.cpp b/tests/core_proxy/core_proxy.cpp index b0f72826d..8095f03e3 100644 --- a/tests/core_proxy/core_proxy.cpp +++ b/tests/core_proxy/core_proxy.cpp @@ -47,7 +47,6 @@ #include "cryptonote_protocol/cryptonote_protocol_handler.h" #include "cryptonote_protocol/cryptonote_protocol_handler.inl" #include "core_proxy.h" -#include "version.h" #if defined(WIN32) #include <crtdbg.h> diff --git a/tests/unit_tests/mnemonics.cpp b/tests/unit_tests/mnemonics.cpp index bd9afbc31..0f9a81b46 100644 --- a/tests/unit_tests/mnemonics.cpp +++ b/tests/unit_tests/mnemonics.cpp @@ -49,9 +49,7 @@ #include "mnemonics/esperanto.h" #include "mnemonics/lojban.h" #include "mnemonics/english_old.h" -#include "mnemonics/language_base.h" #include "mnemonics/singleton.h" -#include <boost/algorithm/string.hpp> namespace { |