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

Merge pull request #4726 from ethereum/moveNothrow

Browse Source 
Make MemberList nothrow move constructible.
This commit is contained in:
chriseth 2018-08-07 16:11:59 +02:00 committed by GitHub
commit c61cc98d0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsolidity/ast/Types.cpp
View File

@ -169,15 +169,6 @@ pair<u256, unsigned> const* StorageOffsets::offset(size_t _index) const
return nullptr; return nullptr;
} }
MemberList& MemberList::operator=(MemberList&& _other)
{
solAssert(&_other != this, "");
m_memberTypes = move(_other.m_memberTypes);
m_storageOffsets = move(_other.m_storageOffsets);
return *this;
}
void MemberList::combine(MemberList const & _other) void MemberList::combine(MemberList const & _other)
{ {
m_memberTypes += _other.m_memberTypes; m_memberTypes += _other.m_memberTypes;

4
libsolidity/ast/Types.h
View File

@ -95,9 +95,7 @@ public:
using MemberMap = std::vector<Member>; using MemberMap = std::vector<Member>;
MemberList() {}
explicit MemberList(MemberMap const& _members): m_memberTypes(_members) {} explicit MemberList(MemberMap const& _members): m_memberTypes(_members) {}
MemberList& operator=(MemberList&& _other);
void combine(MemberList const& _other); void combine(MemberList const& _other);
TypePointer memberType(std::string const& _name) const TypePointer memberType(std::string const& _name) const
{ {
@ -132,6 +130,8 @@ private:
mutable std::unique_ptr<StorageOffsets> m_storageOffsets; mutable std::unique_ptr<StorageOffsets> m_storageOffsets;
}; };
static_assert(std::is_nothrow_move_constructible<MemberList>::value, "MemberList should be noexcept move constructible");
/** /**
* Abstract base class that forms the root of the type hierarchy. * Abstract base class that forms the root of the type hierarchy.
*/ */