diff options
| -rw-r--r-- | libevmasm/SourceLocation.h | 15 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libevmasm/SourceLocation.h b/libevmasm/SourceLocation.h index 54f86450..8e22a826 100644 --- a/libevmasm/SourceLocation.h +++ b/libevmasm/SourceLocation.h @@ -26,6 +26,7 @@ #include <string> #include <ostream> #include <tuple> +#include <libdevcore/Common.h> // defines noexcept macro for MSVC namespace dev { @@ -39,10 +40,20 @@ struct SourceLocation SourceLocation(): start(-1), end(-1) { } SourceLocation(int _start, int _end, std::shared_ptr<std::string const> _sourceName): start(_start), end(_end), sourceName(_sourceName) { } - SourceLocation(SourceLocation&&) = default; + SourceLocation(SourceLocation&& _other) noexcept: + start(_other.start), + end(_other.end), + sourceName(std::move(_other.sourceName)) + {} SourceLocation(SourceLocation const& _other) = default; SourceLocation& operator=(SourceLocation const&) = default; - SourceLocation& operator=(SourceLocation&&) = default; + SourceLocation& operator=(SourceLocation&& _other) noexcept + { + start = _other.start; + end = _other.end; + sourceName = std::move(_other.sourceName); + return *this; + } bool operator==(SourceLocation const& _other) const { return start == _other.start && end == _other.end;} bool operator!=(SourceLocation const& _other) const { return !operator==(_other); } diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index 7d0157d3..5c7163ee 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -207,7 +207,7 @@ assembly::VariableDeclaration Parser::parseVariableDeclaration() return varDecl; } -FunctionalInstruction Parser::parseFunctionalInstruction(Statement&& _instruction) +FunctionalInstruction Parser::parseFunctionalInstruction(assembly::Statement&& _instruction) { if (_instruction.type() != typeid(Instruction)) fatalParserError("Assembly instruction required in front of \"(\")"); |