cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows fix.

Browse Source
This commit is contained in:
chriseth 2016-04-19 19:00:23 +02:00
parent ed9da5171b
commit 8704dd0f7f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libevmasm/SourceLocation.h
View File

@ -26,6 +26,7 @@
#include <string> #include <string>
#include <ostream> #include <ostream>
#include <tuple> #include <tuple>
#include <libdevcore/Common.h> // defines noexcept macro for MSVC
namespace dev namespace dev
{ {
@ -39,10 +40,20 @@ struct SourceLocation
SourceLocation(): start(-1), end(-1) { } SourceLocation(): start(-1), end(-1) { }
SourceLocation(int _start, int _end, std::shared_ptr<std::string const> _sourceName): SourceLocation(int _start, int _end, std::shared_ptr<std::string const> _sourceName):
start(_start), end(_end), sourceName(_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(SourceLocation const& _other) = default;
SourceLocation& operator=(SourceLocation const&) = 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 start == _other.start && end == _other.end;}
bool operator!=(SourceLocation const& _other) const { return !operator==(_other); } bool operator!=(SourceLocation const& _other) const { return !operator==(_other); }

2
libsolidity/inlineasm/AsmParser.cpp
View File

@ -207,7 +207,7 @@ assembly::VariableDeclaration Parser::parseVariableDeclaration()
return varDecl; return varDecl;
} }
FunctionalInstruction Parser::parseFunctionalInstruction(Statement&& _instruction) FunctionalInstruction Parser::parseFunctionalInstruction(assembly::Statement&& _instruction)
{ {
if (_instruction.type() != typeid(Instruction)) if (_instruction.type() != typeid(Instruction))
fatalParserError("Assembly instruction required in front of \"(\")"); fatalParserError("Assembly instruction required in front of \"(\")");