aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-03-25 15:04:02 +0200
committerRiccardo Spagni <ric@spagni.net>2016-03-25 15:04:02 +0200
commit02ee0db6c5945937fde1511d00184fe5c3d02eb7 (patch)
tree8ccdf79fc9c3d2c772e9f587529ac5898e863b0d /contrib
parentMerge pull request #749 (diff)
parentremove connectivity tool, comment it out from munin plugins too (diff)
downloadmonero-02ee0db6c5945937fde1511d00184fe5c3d02eb7.tar.xz
Merge pull request #762
287e882 remove connectivity tool, comment it out from munin plugins too (Riccardo Spagni) 51a56e7 remove unecessary and bad std::move from portable_storage_template_helper.h (Riccardo Spagni)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/epee/include/storages/portable_storage_template_helper.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/epee/include/storages/portable_storage_template_helper.h b/contrib/epee/include/storages/portable_storage_template_helper.h
index 88515b5c3..bbd8413fc 100644
--- a/contrib/epee/include/storages/portable_storage_template_helper.h
+++ b/contrib/epee/include/storages/portable_storage_template_helper.h
@@ -72,7 +72,7 @@ namespace epee
{
std::string json_buff;
store_t_to_json(str_in, json_buff, indent, insert_newlines);
- return std::move(json_buff);
+ return json_buff;
}
//-----------------------------------------------------------------------------------------------------------
template<class t_struct>
@@ -117,7 +117,7 @@ namespace epee
{
std::string binary_buff;
store_t_to_binary(str_in, binary_buff, indent);
- return std::move(binary_buff);
+ return binary_buff;
}
}
}