Apply performance advices from cppcheck

I'm pretty sure the compiler is smart enough to do that by itself,
but it does not hurt and makes the warnings go away.

diff --git a/pdns/dnsdist-rings.hh b/pdns/dnsdist-rings.hh
index bc424a35c089a95a0a656a03cdc9635133be427c..e8c118ba5c5a06a8eb45591d6b66543b9c9f1b36 100644 (file)
--- a/pdns/dnsdist-rings.hh
+++ b/pdns/dnsdist-rings.hh
@@ -124,13 +124,13 @@ struct Rings {
         return;
       }
       if (d_keepLockingStats) {
-        d_deferredQueryInserts++;
+        ++d_deferredQueryInserts;
       }
     }
 
     /* out of luck, let's just wait */
     if (d_keepLockingStats) {
-      d_blockingResponseInserts++;
+      ++d_blockingResponseInserts;
     }
     auto& shard = getOneShard();
     auto lock = shard->queryRing.lock();
@@ -147,13 +147,13 @@ struct Rings {
         return;
       }
       if (d_keepLockingStats) {
-        d_deferredResponseInserts++;
+        ++d_deferredResponseInserts;
       }
     }
 
     /* out of luck, let's just wait */
     if (d_keepLockingStats) {
-      d_blockingResponseInserts++;
+      ++d_blockingResponseInserts;
     }
     auto& shard = getOneShard();
     auto lock = shard->respRing.lock();

diff --git a/pdns/lock.hh b/pdns/lock.hh
index 1b60d46a5e315bbba8b7a6498407a3983b88dd57..2bef0b92adde8bedb46b2d6da7ba78bd7eda47ec 100644 (file)
--- a/pdns/lock.hh
+++ b/pdns/lock.hh
@@ -110,9 +110,8 @@ public:
 
   ReadLock(const ReadLock& rhs) = delete;
   ReadLock& operator=(const ReadLock& rhs) = delete;
-  ReadLock(ReadLock&& rhs)
+  ReadLock(ReadLock&& rhs) : d_lock(std::move(rhs.d_lock))
   {
-    d_lock = std::move(rhs.d_lock);
   }
 
 private:
@@ -136,9 +135,8 @@ public:
 
   WriteLock(const WriteLock& rhs) = delete;
   WriteLock& operator=(const WriteLock& rhs) = delete;
-  WriteLock(WriteLock&& rhs)
+  WriteLock(WriteLock&& rhs) : d_lock(std::move(rhs.d_lock))
   {
-    d_lock = std::move(rhs.d_lock);
   }
 
 private: