diff --git a/arangod/Aql/Expression.cpp b/arangod/Aql/Expression.cpp index 1eb86217a8..f918f461f6 100644 --- a/arangod/Aql/Expression.cpp +++ b/arangod/Aql/Expression.cpp @@ -935,8 +935,7 @@ AqlValue Expression::executeSimpleExpressionFCall (AstNode const* node, parameters.emplace_back(AqlValue(new Json(TRI_UNKNOWN_MEM_ZONE, arg->getStringValue(), arg->getStringLength())), nullptr); } else { - auto value = executeSimpleExpression(arg, &myCollection, trx, argv, startPos, vars, regs, false); - parameters.emplace_back(value, myCollection); + parameters.emplace_back(executeSimpleExpression(arg, &myCollection, trx, argv, startPos, vars, regs, false), myCollection); } } diff --git a/lib/V8/v8-conv.cpp b/lib/V8/v8-conv.cpp index 6ef46ea4d8..27df5f0ab1 100644 --- a/lib/V8/v8-conv.cpp +++ b/lib/V8/v8-conv.cpp @@ -678,7 +678,7 @@ std::string TRI_ObjectToString (v8::Handle const value) { return ""; } - return std::string(*utf8Value, utf8Value.length()); + return std::move(std::string(*utf8Value, utf8Value.length())); } ////////////////////////////////////////////////////////////////////////////////