commit c7998b65098ae26a3b0386c12fdae20864d3c256
author Peter Collingbourne <pcc@google.com> Thu Jan 16 23:42:58 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 16 23:42:58 2020 +0000
tree 1fca733b51a9c7d7de11caa04f8d11a3cf38fd7c
parent 5b973e7b73266f3267039b496eb395253f3ff39f
parent ad8f4232693b436b52e4771916c4f82bd055d78e

Merge "Change ConcurrentMap::setLocked() to take a const K& instead of K&&."

transport/include/hidl/ConcurrentMap.h

diff --git a/transport/include/hidl/ConcurrentMap.h b/transport/include/hidl/ConcurrentMap.h
index 329752c..57b28c5 100644
--- a/transport/include/hidl/ConcurrentMap.h
+++ b/transport/include/hidl/ConcurrentMap.h
@@ -66,8 +66,8 @@
 
     std::unique_lock<std::mutex> lock() { return std::unique_lock<std::mutex>(mMutex); }
 
-    void setLocked(K&& k, V&& v) { mMap[std::forward<K>(k)] = std::forward<V>(v); }
-    void setLocked(K&& k, const V& v) { mMap[std::forward<K>(k)] = v; }
+    void setLocked(const K& k, V&& v) { mMap[k] = std::forward<V>(v); }
+    void setLocked(const K& k, const V& v) { mMap[k] = v; }
 
     const V& getLocked(const K& k, const V& def) const {
         const_iterator iter = mMap.find(k);