From 7b81a65bc60c0b7cdfc3e31cdfa1874dfa7a6304 Mon Sep 17 00:00:00 2001 From: wechman Date: Wed, 14 Sep 2022 13:54:22 +0200 Subject: [PATCH] Fixes after rebase --- libsolidity/ast/ASTJsonExporter.cpp | 2 +- libsolidity/ast/ASTJsonImporter.cpp | 2 +- .../operators/custom/external_call_inside_operator_function.sol | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp index d3815b37d..1fa7a116f 100644 --- a/libsolidity/ast/ASTJsonExporter.cpp +++ b/libsolidity/ast/ASTJsonExporter.cpp @@ -339,7 +339,7 @@ bool ASTJsonExporter::visit(UsingForDirective const& _node) functionNode["function"] = toJson(*function); if (op.has_value()) functionNode["operator"] = string(TokenTraits::toString(*op)); - functionList.append(move(functionNode)); + functionList.append(std::move(functionNode)); } attributes.emplace_back("functionList", std::move(functionList)); } diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp index 61c444eeb..5edf94551 100644 --- a/libsolidity/ast/ASTJsonImporter.cpp +++ b/libsolidity/ast/ASTJsonImporter.cpp @@ -405,7 +405,7 @@ ASTPointer ASTJsonImporter::createUsingForDirective(Json::Val return createASTNode( _node, std::move(functions), - move(operators), + std::move(operators), !_node.isMember("libraryName"), _node["typeName"].isNull() ? nullptr : convertJsonToASTNode(_node["typeName"]), memberAsBool(_node, "global") diff --git a/test/libsolidity/semanticTests/operators/custom/external_call_inside_operator_function.sol b/test/libsolidity/semanticTests/operators/custom/external_call_inside_operator_function.sol index e55449cac..f92c933cf 100644 --- a/test/libsolidity/semanticTests/operators/custom/external_call_inside_operator_function.sol +++ b/test/libsolidity/semanticTests/operators/custom/external_call_inside_operator_function.sol @@ -24,3 +24,4 @@ contract C { // ---- // test() -> 3 +// gas legacy: 119695