aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Vickio <chris@vickio.net>2017-01-14 13:47:45 +0300
committerChris Vickio <chris@vickio.net>2017-01-15 19:23:33 +0300
commit0aefb2f60a26d250ed2e1fb8f205c901c54ca850 (patch)
treeafb7b07c607ae57a0d925c10c2b0beef85520f63 /src
parentchange counter from bool to int (deprecated-increment-bool warning) (diff)
downloadmonero-0aefb2f60a26d250ed2e1fb8f205c901c54ca850.tar.xz
remove std::move from return statements (pessimizing-move warning)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 2173650bf..4b99e617d 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -4967,7 +4967,7 @@ std::string wallet2::encrypt(const std::string &plaintext, const crypto::secret_
crypto::signature &signature = *(crypto::signature*)&ciphertext[ciphertext.size() - sizeof(crypto::signature)];
crypto::generate_signature(hash, pkey, skey, signature);
}
- return std::move(ciphertext);
+ return ciphertext;
}
//----------------------------------------------------------------------------------------------------
std::string wallet2::encrypt_with_view_secret_key(const std::string &plaintext, bool authenticated) const
@@ -4997,7 +4997,7 @@ std::string wallet2::decrypt(const std::string &ciphertext, const crypto::secret
error::wallet_internal_error, "Failed to authenticate criphertext");
}
crypto::chacha8(ciphertext.data() + sizeof(iv), ciphertext.size() - prefix_size, key, iv, &plaintext[0]);
- return std::move(plaintext);
+ return plaintext;
}
//----------------------------------------------------------------------------------------------------
std::string wallet2::decrypt_with_view_secret_key(const std::string &ciphertext, bool authenticated) const