aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--c++tools/resolver.cc4
-rw-r--r--libcody/client.cc3
2 files changed, 2 insertions, 5 deletions
diff --git a/c++tools/resolver.cc b/c++tools/resolver.cc
index c8d3115..ef08de5 100644
--- a/c++tools/resolver.cc
+++ b/c++tools/resolver.cc
@@ -226,9 +226,7 @@ module_resolver::cmi_response (Cody::Server *s, std::string &module)
auto iter = map.find (module);
if (iter == map.end ())
{
- std::string file;
- if (default_map)
- file = std::move (GetCMIName (module));
+ std::string file = default_map ? GetCMIName (module) : std::string ();
auto res = map.emplace (module, file);
iter = res.first;
}
diff --git a/libcody/client.cc b/libcody/client.cc
index edfe44d..ae69d19 100644
--- a/libcody/client.cc
+++ b/libcody/client.cc
@@ -122,8 +122,7 @@ Packet Client::ProcessResponse (std::vector<std::string> &words,
Assert (!words.empty ());
if (words[0] == u8"ERROR")
return Packet (Client::PC_ERROR,
- std::move (words.size () == 2 ? words[1]
- : u8"malformed error response"));
+ words.size () == 2 ? words[1]: u8"malformed error response");
if (isLast && !read.IsAtEnd ())
return Packet (Client::PC_ERROR,