diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index 66fa00b36..e5506a660 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -531,7 +531,7 @@ QString Main::lookup(QString const& _a) const void Main::on_about_triggered() { - QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nThanks to the various contributors including: Alex Leverington, Tim Hughes, caktux, Eric Lombrozo, Marko Simovic."); + QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBerlin ÐΞV team, 2014.\nOriginally by Gav Wood. Based on a design by Vitalik Buterin.\n\nThanks to the various contributors including: Tim Hughes, caktux, Eric Lombrozo, Marko Simovic."); } void Main::on_paranoia_triggered() diff --git a/libethcore/CommonEth.cpp b/libethcore/CommonEth.cpp index 21bdaba2e..19522d5de 100644 --- a/libethcore/CommonEth.cpp +++ b/libethcore/CommonEth.cpp @@ -33,7 +33,7 @@ namespace dev namespace eth { -const unsigned c_protocolVersion = 42; +const unsigned c_protocolVersion = 43; const unsigned c_databaseVersion = 4; static const vector> g_units = diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index 183a072e3..d130194cc 100644 --- a/libethereum/Client.cpp +++ b/libethereum/Client.cpp @@ -627,11 +627,15 @@ LogEntries Client::logs(LogFilter const& _f) const } } } +#if ETH_DEBUG if (!total) falsePos++; +#endif } +#if ETH_DEBUG else skipped++; +#endif if (n == end) break; } diff --git a/libsolidity/NameAndTypeResolver.cpp b/libsolidity/NameAndTypeResolver.cpp index 5bc406855..aa7726582 100644 --- a/libsolidity/NameAndTypeResolver.cpp +++ b/libsolidity/NameAndTypeResolver.cpp @@ -211,6 +211,7 @@ bool ReferencesResolver::visit(Return& _return) bool ReferencesResolver::visit(Mapping& _mapping) { + (void)_mapping; return true; } diff --git a/libsolidity/Types.cpp b/libsolidity/Types.cpp index 63bad5d61..e24435976 100644 --- a/libsolidity/Types.cpp +++ b/libsolidity/Types.cpp @@ -267,7 +267,7 @@ u256 StructType::getStorageOffsetOfMember(unsigned _index) const { //@todo cache member offset? u256 offset; - vector> const& members = m_struct.getMembers(); +// vector> const& members = m_struct.getMembers(); for (unsigned index = 0; index < _index; ++index) offset += getMemberByIndex(index).getType()->getStorageSize(); return offset;