diff options
| author | chriseth <chris@ethereum.org> | 2018-11-07 19:42:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 19:42:02 +0800 |
| commit | a459b8c81ec92f39be67c2d373d120eb86140e00 (patch) | |
| tree | 3ff90d9e6afde63d1217b37ed62ab6e98d1139fc /libdevcore/CommonData.cpp | |
| parent | 88aee34c22d86a004848ae8bdc818b5168dd94cb (diff) | |
| parent | ab0de38f16a9eff13ee5a32a3408b890d87941f6 (diff) | |
| download | dexon-solidity-a459b8c81ec92f39be67c2d373d120eb86140e00.tar dexon-solidity-a459b8c81ec92f39be67c2d373d120eb86140e00.tar.gz dexon-solidity-a459b8c81ec92f39be67c2d373d120eb86140e00.tar.bz2 dexon-solidity-a459b8c81ec92f39be67c2d373d120eb86140e00.tar.lz dexon-solidity-a459b8c81ec92f39be67c2d373d120eb86140e00.tar.xz dexon-solidity-a459b8c81ec92f39be67c2d373d120eb86140e00.tar.zst dexon-solidity-a459b8c81ec92f39be67c2d373d120eb86140e00.zip | |
Merge pull request #5359 from ethereum/cpp17-forward-compat
Eliminate `byte`-typedef and use `uint8_t` in all their places instead.
Diffstat (limited to 'libdevcore/CommonData.cpp')
| -rw-r--r-- | libdevcore/CommonData.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdevcore/CommonData.cpp b/libdevcore/CommonData.cpp index fa1a5353..91c60ffe 100644 --- a/libdevcore/CommonData.cpp +++ b/libdevcore/CommonData.cpp @@ -64,7 +64,7 @@ bytes dev::fromHex(std::string const& _s, WhenError _throw) int h = fromHex(_s[i], WhenError::DontThrow); int l = fromHex(_s[i + 1], WhenError::DontThrow); if (h != -1 && l != -1) - ret.push_back((byte)(h * 16 + l)); + ret.push_back((uint8_t)(h * 16 + l)); else if (_throw == WhenError::Throw) BOOST_THROW_EXCEPTION(BadHexCharacter()); else |