cerc-io/solidity
10
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

Fix findOffset for containers with .find.

Browse Source
This commit is contained in:
Daniel Kirchner 2021-08-10 12:45:50 +02:00
parent 535d30bbb3
commit 20956a7a19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolutil/CommonData.h
View File

@ -341,13 +341,13 @@ namespace detail
template<typename Container, typename Value> template<typename Container, typename Value>
auto findOffset(Container&& _container, Value&& _value, int) auto findOffset(Container&& _container, Value&& _value, int)
-> decltype(_container.find(_value) == _container.end(), std::optional<size_t>()) -> decltype(_container.find(_value) == _container.end(), std::distance(_container.begin(), _container.find(_value)), std::optional<size_t>())
{ {
auto it = _container.find(std::forward<Value>(_value)); auto it = _container.find(std::forward<Value>(_value));
auto end = _container.end(); auto end = _container.end();
if (it == end) if (it == end)
return std::nullopt; return std::nullopt;
return std::distance(it, end); return std::distance(_container.begin(), it);
} }
template<typename Range, typename Value> template<typename Range, typename Value>
auto findOffset(Range&& _range, Value&& _value, void*) auto findOffset(Range&& _range, Value&& _value, void*)