Merge pull request #4154 from juliusHuelsmann/fix-warnings-and-arch-install

Fix 3 warnings for gcc8.1, altered `install_deps.sh` for Arch Linux
This commit is contained in:
Alex Beregszaszi 2018-05-17 16:24:27 +02:00 committed by GitHub
commit 4aa2f036ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View File

@ -606,7 +606,9 @@ bool Parser::isValidNumberLiteral(string const& _literal)
{ {
try try
{ {
u256(_literal); // Try to convert _literal to u256.
auto tmp = u256(_literal);
(void) tmp;
} }
catch (...) catch (...)
{ {

View File

@ -117,7 +117,7 @@ bool hashMatchesContent(string const& _hash, string const& _content)
{ {
return dev::h256(_hash) == dev::keccak256(_content); return dev::h256(_hash) == dev::keccak256(_content);
} }
catch (dev::BadHexCharacter) catch (dev::BadHexCharacter const&)
{ {
return false; return false;
} }
@ -366,7 +366,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
// @TODO use libraries only for the given source // @TODO use libraries only for the given source
libraries[library] = h160(address); libraries[library] = h160(address);
} }
catch (dev::BadHexCharacter) catch (dev::BadHexCharacter const&)
{ {
return formatFatalError( return formatFatalError(
"JSONError", "JSONError",

View File

@ -133,19 +133,18 @@ case $(uname -s) in
# Arch Linux # Arch Linux
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
Arch) Arch*)
#Arch #Arch
echo "Installing solidity dependencies on Arch Linux." echo "Installing solidity dependencies on Arch Linux."
# All our dependencies can be found in the Arch Linux official repositories. # All our dependencies can be found in the Arch Linux official repositories.
# See https://wiki.archlinux.org/index.php/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 \ sudo pacman -Syu \
base-devel \ base-devel \
boost \ boost \
cmake \ cmake \
git \ git \
ethereum-git \ cvc4
;; ;;
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -329,7 +328,7 @@ case $(uname -s) in
"$install_z3" "$install_z3"
if [ "$CI" = true ]; then if [ "$CI" = true ]; then
# install Z3 from PPA if the distribution does not provide it # 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 then
sudo apt-add-repository -y ppa:hvr/z3 sudo apt-add-repository -y ppa:hvr/z3
sudo apt-get -y update sudo apt-get -y update