diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-05-17 22:24:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 22:24:27 +0800 |
| commit | 4aa2f036ce74d9a210e12ac4df928a5ecb006e28 (patch) | |
| tree | 72cf7ac1ee2b825e8e387b5052dbefb27606ab2d | |
| parent | 0fdb226fd8d352f6b2b84e3efc61cd674e93ab1b (diff) | |
| parent | 1d3a37faff9a82a5269c3414a2d6fe868593afb1 (diff) | |
| download | dexon-solidity-4aa2f036ce74d9a210e12ac4df928a5ecb006e28.tar.gz dexon-solidity-4aa2f036ce74d9a210e12ac4df928a5ecb006e28.tar.zst dexon-solidity-4aa2f036ce74d9a210e12ac4df928a5ecb006e28.zip | |
Merge pull request #4154 from juliusHuelsmann/fix-warnings-and-arch-install
Fix 3 warnings for gcc8.1, altered `install_deps.sh` for Arch Linux
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 4 | ||||
| -rw-r--r-- | libsolidity/interface/StandardCompiler.cpp | 4 | ||||
| -rwxr-xr-x | scripts/install_deps.sh | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index d3b0808b..d300f8fb 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -606,7 +606,9 @@ bool Parser::isValidNumberLiteral(string const& _literal) { try { - u256(_literal); + // Try to convert _literal to u256. + auto tmp = u256(_literal); + (void) tmp; } catch (...) { diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp index ee9b1440..c8d43e9f 100644 --- a/libsolidity/interface/StandardCompiler.cpp +++ b/libsolidity/interface/StandardCompiler.cpp @@ -117,7 +117,7 @@ bool hashMatchesContent(string const& _hash, string const& _content) { return dev::h256(_hash) == dev::keccak256(_content); } - catch (dev::BadHexCharacter) + catch (dev::BadHexCharacter const&) { return false; } @@ -366,7 +366,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input) // @TODO use libraries only for the given source libraries[library] = h160(address); } - catch (dev::BadHexCharacter) + catch (dev::BadHexCharacter const&) { return formatFatalError( "JSONError", diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index fa5551bf..1843b064 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -133,19 +133,18 @@ case $(uname -s) in # Arch Linux #------------------------------------------------------------------------------ - Arch) + Arch*) #Arch echo "Installing solidity dependencies on Arch Linux." # All our dependencies can be found in the Arch Linux official repositories. # See https://wiki.archlinux.org/index.php/Official_repositories - # Also adding ethereum-git to allow for testing with the `eth` client sudo pacman -Syu \ base-devel \ boost \ cmake \ git \ - ethereum-git \ + cvc4 ;; #------------------------------------------------------------------------------ @@ -329,7 +328,7 @@ case $(uname -s) in "$install_z3" if [ "$CI" = true ]; then # install Z3 from PPA if the distribution does not provide it - if ! dpkg -l libz3-dev > /dev/null 2>&1 + if ! dpkg -l libz3-dev > /dev/null 2>&1 then sudo apt-add-repository -y ppa:hvr/z3 sudo apt-get -y update |