Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-21 09:58:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5865

Browse source 
11f13da blockchain: fix logging bad number of blocks if first one fails (moneromooo-monero)
19bfe7e simplewallet: fix warnings about useless std::move (moneromooo-monero)
This commit is contained in:
luigi1111 2019-09-14 13:07:35 -05:00
commit 4a39e1a4a5
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/simplewallet/simplewallet.cpp
View file

@ -4461,7 +4461,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
}
success_msg_writer() << "**********************************************************************";
return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::program_options::variables_map& vm,
@ -4510,7 +4510,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
}
return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
@ -4553,7 +4553,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
return {};
}
return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::program_options::variables_map& vm,
@ -4608,7 +4608,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
return {};
}
return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
boost::optional<epee::wipeable_string> simple_wallet::open_wallet(const boost::program_options::variables_map& vm)
@ -4711,7 +4711,7 @@ boost::optional<epee::wipeable_string> simple_wallet::open_wallet(const boost::p
tr("Use the \"help\" command to see the list of available commands.\n") <<
tr("Use \"help <command>\" to see a command's documentation.\n") <<
"**********************************************************************";
return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
bool simple_wallet::close_wallet()