diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 12:55:02 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 12:55:02 -0500 |
| commit | cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423 (patch) | |
| tree | 932e460664a6329d5b9906506d1d6951378768a2 /src/wallet | |
| parent | 44547006bfcac4f807d28016d597b7e5d3693dfd (diff) | |
| parent | 3387f0e327cb817c5f7f7f4c3d5dcc4990747cd1 (diff) | |
| download | monzero-core-cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423.tar.gz monzero-core-cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423.tar.xz monzero-core-cfc0f4a7fa67dd880d51c0aa35baa1e73e5db423.zip | |
Merge pull request #6351
81c5943 Remove temporary std::string creation in some hex->bin calls (vtnerd)
5fcc23a Move hex->bin conversion to monero copyright files and with less includes (vtnerd)
3387f0e Reduce template bloat in hex->bin for ZMQ json (vtnerd)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 70ceddad3..f05a67315 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -355,7 +355,7 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl else if (!daemon_ssl_ca_file.empty() || !daemon_ssl_allowed_fingerprints.empty()) { std::vector<std::vector<uint8_t>> ssl_allowed_fingerprints{ daemon_ssl_allowed_fingerprints.size() }; - std::transform(daemon_ssl_allowed_fingerprints.begin(), daemon_ssl_allowed_fingerprints.end(), ssl_allowed_fingerprints.begin(), epee::from_hex::vector); + std::transform(daemon_ssl_allowed_fingerprints.begin(), daemon_ssl_allowed_fingerprints.end(), ssl_allowed_fingerprints.begin(), epee::from_hex_locale::to_vector); for (const auto &fpr: ssl_allowed_fingerprints) { THROW_WALLET_EXCEPTION_IF(fpr.size() != SSL_FINGERPRINT_SIZE, tools::error::wallet_internal_error, |