diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-01-11 12:13:48 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-01-11 12:13:48 -0500 |
| commit | 75d80d431a9586996c559cb39f3eabebad3da60a (patch) | |
| tree | 3414ea229a37ef40078c7852dc053b08c77a071d | |
| parent | Merge pull request #8682 (diff) | |
| parent | common: move boost_serialization_helper.h out and cleanup includes (diff) | |
| download | monero-75d80d431a9586996c559cb39f3eabebad3da60a.tar.xz | |
Merge pull request #8686
7a3a593 common: move boost_serialization_helper.h out and cleanup includes (Jeffrey Ryan)
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 1 | ||||
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 3 | ||||
| -rw-r--r-- | tests/core_tests/chaingen.h | 2 | ||||
| -rw-r--r-- | tests/core_tests/chaingen_serialization.h (renamed from src/common/boost_serialization_helper.h) | 0 |
5 files changed, 3 insertions, 4 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index d9c4193a9..b1903cf6c 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -48,7 +48,6 @@ #include "file_io_utils.h" #include "int-util.h" #include "common/threadpool.h" -#include "common/boost_serialization_helper.h" #include "warnings.h" #include "crypto/hash.h" #include "cryptonote_core.h" diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 2a514ceae..3346a9aba 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -40,7 +40,6 @@ #include "blockchain.h" #include "blockchain_db/locked_txn.h" #include "blockchain_db/blockchain_db.h" -#include "common/boost_serialization_helper.h" #include "int-util.h" #include "misc_language.h" #include "warnings.h" diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 1880d7ea0..9e99cac83 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -39,7 +39,9 @@ #include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/predicate.hpp> +#include <boost/archive/binary_iarchive.hpp> #include <boost/asio/ip/address.hpp> +#include <boost/filesystem/operations.hpp> #include <boost/range/adaptor/transformed.hpp> #include <boost/preprocessor/stringize.hpp> #include <openssl/evp.h> @@ -64,7 +66,6 @@ using namespace epee; #include "multisig/multisig_account.h" #include "multisig/multisig_kex_msg.h" #include "multisig/multisig_tx_builder_ringct.h" -#include "common/boost_serialization_helper.h" #include "common/command_line.h" #include "common/threadpool.h" #include "int-util.h" diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h index d5c9edc55..1f782831f 100644 --- a/tests/core_tests/chaingen.h +++ b/tests/core_tests/chaingen.h @@ -44,7 +44,7 @@ #include <boost/functional/hash.hpp> #include "include_base_utils.h" -#include "common/boost_serialization_helper.h" +#include "chaingen_serialization.h" #include "common/command_line.h" #include "common/threadpool.h" diff --git a/src/common/boost_serialization_helper.h b/tests/core_tests/chaingen_serialization.h index 4a903107f..4a903107f 100644 --- a/src/common/boost_serialization_helper.h +++ b/tests/core_tests/chaingen_serialization.h |