diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-07-08 23:00:38 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-07-08 23:00:38 +0200 |
| commit | 18dd50702407ece54a98563921fa744c6b7c15b2 (patch) | |
| tree | ec6e76a7cb7d60dc3ccc7dee8e1e16a26603f1d9 /src | |
| parent | 59172156bf0c6a74b3597331b053d1195e39122f (diff) | |
| parent | a0bf85d09d07e0e2a893a46161a195e87dc3e8c6 (diff) | |
| download | monzero-core-18dd50702407ece54a98563921fa744c6b7c15b2.tar.gz monzero-core-18dd50702407ece54a98563921fa744c6b7c15b2.tar.xz monzero-core-18dd50702407ece54a98563921fa744c6b7c15b2.zip | |
Merge pull request #889
a0bf85d wallet2_api: make this build (smatch needs .str() for /=) (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index 4ed6e09fb..bf072ccca 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -101,7 +101,7 @@ std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path) bool matched = boost::regex_match(filename, what, wallet_rx); if (matched) { // if keys file found, checking if there's wallet file itself - std::string wallet_file = (itr->path().parent_path() /= what[1]).string(); + std::string wallet_file = (itr->path().parent_path() /= what[1].str()).string(); if (boost::filesystem::exists(wallet_file)) { LOG_PRINT_L3("Found wallet: " << wallet_file); result.push_back(wallet_file); |