From 7d9692c31d411a66ea194480bf3963cb97e2c257 Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 9 Aug 2018 01:12:39 +0200 Subject: Explicitly use std::next to avoid boost version. --- libdevcore/StringUtils.h | 2 +- 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; -- cgit v1.2.3