diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:58:46 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:58:46 +0200 |
| commit | b806d9844e4cfdb94e7a2d175efdf41d5ad480ff (patch) | |
| tree | f90f634f25079749febf00618ac3160d204f2d7a /src/wallet | |
| parent | Merge pull request #2881 (diff) | |
| parent | move includes around to lessen overall load (diff) | |
| download | monero-b806d9844e4cfdb94e7a2d175efdf41d5ad480ff.tar.xz | |
Merge pull request #2864
09ce03d6 move includes around to lessen overall load (moneromooo-monero)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 7 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 2 | ||||
| -rw-r--r-- | src/wallet/wallet_args.cpp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 59e759bfc..7b7e371a2 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -28,12 +28,15 @@ // // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers +#include <numeric> #include <random> #include <tuple> #include <boost/format.hpp> #include <boost/optional/optional.hpp> #include <boost/utility/value_init.hpp> -#include <boost/algorithm/string/join.hpp> +#include <boost/algorithm/string/classification.hpp> +#include <boost/algorithm/string/trim.hpp> +#include <boost/algorithm/string/split.hpp> #include "include_base_utils.h" using namespace epee; @@ -49,7 +52,7 @@ using namespace epee; #include "profile_tools.h" #include "crypto/crypto.h" #include "serialization/binary_utils.h" -#include "cryptonote_protocol/blobdatatype.h" +#include "cryptonote_basic/blobdatatype.h" #include "mnemonics/electrum-words.h" #include "common/i18n.h" #include "common/util.h" diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index de1bed90c..be8315468 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -59,8 +59,6 @@ #include "common/password.h" #include "node_rpc_proxy.h" -#include <iostream> - #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "wallet.wallet2" diff --git a/src/wallet/wallet_args.cpp b/src/wallet/wallet_args.cpp index e665042d4..91162c4bc 100644 --- a/src/wallet/wallet_args.cpp +++ b/src/wallet/wallet_args.cpp @@ -28,6 +28,7 @@ #include "wallet/wallet_args.h" #include <boost/filesystem/path.hpp> +#include <boost/filesystem/operations.hpp> #include <boost/format.hpp> #include "common/i18n.h" #include "common/util.h" |