Fixes after rebase

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));
 	}

libsolidity/ast/ASTJsonImporter.cpp

@@ -405,7 +405,7 @@ ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Val
 	return createASTNode<UsingForDirective>(
 		_node,
 		std::move(functions),
-		move(operators),
+		std::move(operators),
 		!_node.isMember("libraryName"),
 		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"]),
 		memberAsBool(_node, "global")