diff options
| author | chriseth <chris@ethereum.org> | 2018-08-09 07:30:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 07:30:40 +0800 |
| commit | 711e2b7cff671141009877423fad605627f95e30 (patch) | |
| tree | c2cabf6e1ca0c17813ecc7bea97595075f913042 | |
| parent | b4e33ec25ceb35b53876ad6af58148079dcbeeb7 (diff) | |
| parent | 7d9692c31d411a66ea194480bf3963cb97e2c257 (diff) | |
| download | dexon-solidity-711e2b7cff671141009877423fad605627f95e30.tar dexon-solidity-711e2b7cff671141009877423fad605627f95e30.tar.gz dexon-solidity-711e2b7cff671141009877423fad605627f95e30.tar.bz2 dexon-solidity-711e2b7cff671141009877423fad605627f95e30.tar.lz dexon-solidity-711e2b7cff671141009877423fad605627f95e30.tar.xz dexon-solidity-711e2b7cff671141009877423fad605627f95e30.tar.zst dexon-solidity-711e2b7cff671141009877423fad605627f95e30.zip | |
Merge pull request #4781 from ethereum/stdNext
Explicitly use std::next to avoid boost version.
| -rw-r--r-- | libdevcore/StringUtils.h | 2 | ||||
| -rw-r--r-- | libevmasm/Instruction.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libdevcore/StringUtils.h b/libdevcore/StringUtils.h index 4fb5a748..94c6e3c5 100644 --- a/libdevcore/StringUtils.h +++ b/libdevcore/StringUtils.h @@ -63,7 +63,7 @@ std::string joinHumanReadable for (;it != itEnd; ++it) { - if ((next(it) == itEnd) && !_lastSeparator.empty()) + if ((std::next(it) == itEnd) && !_lastSeparator.empty()) result += _lastSeparator; // last iteration else result += _separator; diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index 37c5fdd4..d5b82e75 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -330,7 +330,7 @@ void dev::solidity::eachInstruction( u256 data; // fill the data with the additional data bytes from the instruction stream - while (additional > 0 && next(it) < _mem.end()) + while (additional > 0 && std::next(it) < _mem.end()) { data <<= 8; data |= *++it; |