From 9071de1133439bebb7f706b34c53a943cf448ae6 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sun, 10 May 2015 13:45:36 +0300 Subject: [PATCH] Build fixes. --- libethereum/KeyManager.cpp | 2 +- libethereum/KeyManager.h | 2 ++ libsolidity/ASTPrinter.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libethereum/KeyManager.cpp b/libethereum/KeyManager.cpp index 92426289e..15f767c88 100644 --- a/libethereum/KeyManager.cpp +++ b/libethereum/KeyManager.cpp @@ -60,7 +60,7 @@ bool KeyManager::load(std::string const& _pass) if (version == 1) { for (auto const& i: s[1]) - m_keyInfo[m_addrLookup[(Address)i[0]] = (h128)i[1]] = KeyInfo{(h256)i[2], (std::string)i[3]}; + m_keyInfo[m_addrLookup[(Address)i[0]] = (h128)i[1]] = KeyInfo((h256)i[2], (std::string)i[3]); for (auto const& i: s[2]) m_passwordInfo[(h256)i[0]] = (std::string)i[1]; m_password = (string)s[3]; diff --git a/libethereum/KeyManager.h b/libethereum/KeyManager.h index 223d60670..9cb22e5b3 100644 --- a/libethereum/KeyManager.h +++ b/libethereum/KeyManager.h @@ -33,6 +33,8 @@ class UnknownPassword: public Exception {}; struct KeyInfo { + KeyInfo() = default; + KeyInfo(h256 const& _passHash, std::string const& _info): passHash(_passHash), info(_info) {} h256 passHash; std::string info; }; diff --git a/libsolidity/ASTPrinter.h b/libsolidity/ASTPrinter.h index dabf6470a..25678c176 100644 --- a/libsolidity/ASTPrinter.h +++ b/libsolidity/ASTPrinter.h @@ -42,7 +42,7 @@ public: ASTPrinter( ASTNode const& _ast, std::string const& _source = std::string(), - StructuralGasEstimator::ASTGasConsumption const& _gasCosts = {} + StructuralGasEstimator::ASTGasConsumption const& _gasCosts = StructuralGasEstimator::ASTGasConsumption() ); /// Output the string representation of the AST to _stream. void print(std::ostream& _stream);