dnsdist: Get rid of std::move() calls preventing copy elision

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 89ce577f2453abcc18aca500a6024dc82b3175d7..a56181b878071801334a89b524155de88614d783 100644 (file)
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -309,11 +309,11 @@ vector<std::function<void(void)>> setupLua(bool client, const std::string& confi
                          if (ret->connected) {
                            if(g_launchWork) {
                              g_launchWork->push_back([ret]() {
-                               ret->tid = move(thread(responderThread, ret));
+                               ret->tid = thread(responderThread, ret);
                              });
                            }
                            else {
-                             ret->tid = move(thread(responderThread, ret));
+                             ret->tid = thread(responderThread, ret);
                            }
                          }
 
@@ -470,11 +470,11 @@ vector<std::function<void(void)>> setupLua(bool client, const std::string& confi
                        if (ret->connected) {
                          if(g_launchWork) {
                            g_launchWork->push_back([ret]() {
-                             ret->tid = move(thread(responderThread, ret));
+                             ret->tid = thread(responderThread, ret);
                            });
                          }
                          else {
-                           ret->tid = move(thread(responderThread, ret));
+                           ret->tid = thread(responderThread, ret);
                          }
                        }
 

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 025dd8701ff8e069180d84ce0ee09666b95462fe..592eae28e72921fba4a98570d99918575b235f57 100644 (file)
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -1505,7 +1505,7 @@ void* healthChecksThread()
             try {
               SConnect(dss->fd, dss->remote);
               dss->connected = true;
-              dss->tid = move(thread(responderThread, dss));
+              dss->tid = thread(responderThread, dss);
             }
             catch(const std::runtime_error& error) {
               infolog("Error connecting to new server with address %s: %s", dss->remote.toStringWithPort(), error.what());
@@ -2184,7 +2184,7 @@ try
       auto ret=std::make_shared<DownstreamState>(ComboAddress(address, 53));
       addServerToPool(localPools, "", ret);
       if (ret->connected) {
-        ret->tid = move(thread(responderThread, ret));
+        ret->tid = thread(responderThread, ret);
       }
       g_dstates.modify([ret](servers_t& servers) { servers.push_back(ret); });
     }