Revert "Revert "Unify access to assets needed during rank-setup.""

1 files changed, 5 insertions, 2 deletions

diff --git a/vespalib/src/vespa/vespalib/util/varholder.h b/vespalib/src/vespa/vespalib/util/varholder.h
index d92c00e0081..c9bd9f1641a 100644
--- a/vespalib/src/vespa/vespalib/util/varholder.h
+++ b/vespalib/src/vespa/vespalib/util/varholder.h
@@ -13,10 +13,10 @@ class VarHolder
     mutable std::mutex  _lock;
 public:
     VarHolder() : _v(), _lock() {}
-    explicit VarHolder(const T &v) : _v(v), _lock() {}
+    explicit VarHolder(T v) : _v(std::move(v)), _lock() {}
     VarHolder(const VarHolder &) = delete;
     VarHolder & operator = (const VarHolder &) = delete;
-    ~VarHolder() {}
+    ~VarHolder();
 
     void set(const T &v) {
         T old;
@@ -35,4 +35,7 @@ public:
     }
 };
 
+template <typename T>
+VarHolder<T>::~VarHolder() = default;
+
 }