s

Author: firewave

lib/valueflow.cpp

@@ -8014,7 +8014,7 @@ static void valueFlowUninit(TokenList& tokenlist, const Settings* settings)
                     continue;
                 }
                 MemberExpressionAnalyzer analyzer(memVar.nameToken()->str(), tok, uninitValue, tokenlist, settings);
-                valueFlowGenericForward(start, tok->scope()->bodyEnd, std::move(analyzer), *settings);
+                valueFlowGenericForward(start, tok->scope()->bodyEnd, analyzer, *settings);
 
                 for (auto&& p : *analyzer.partialReads) {
                     Token* tok2 = p.first;

lib/valueptr.h

@@ -32,6 +32,9 @@ class CPPCHECKLIB ValuePtr {
         static T* apply(const T* x) {
             return new U(*static_cast<const U*>(x));
         }
+        static T* move(T* x) {
+            return new U(std::move(*static_cast<const U*>(x)));
+        }
     };
 
 public:
@@ -47,6 +50,10 @@ class CPPCHECKLIB ValuePtr {
     ValuePtr(const U& value) : mPtr(cloner<U>::apply(&value)), mClone(&cloner<U>::apply)
     {}
 
+    template<class U>
+    ValuePtr(U&& value) : mPtr(cloner<U>::move(&value)), mClone(&cloner<U>::apply)
+    {}
+
     ValuePtr(const ValuePtr& rhs) : mPtr(nullptr), mClone(rhs.mClone) {
         if (rhs) {
             mPtr.reset(mClone(rhs.get()));