From 148e2d8d14bac845bf2eaf4e3cb25610183df2d1 Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Tue, 3 Mar 2015 15:56:49 +0100 Subject: [PATCH] fixing pr issues --- libethereum/Client.cpp | 4 ++-- libevm/ExtVMFace.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index 02412f4c1..fe07cbb18 100644 --- a/libethereum/Client.cpp +++ b/libethereum/Client.cpp @@ -794,7 +794,7 @@ LocalisedLogEntries Client::logs(LogFilter const& _f) const TransactionReceipt receipt = receipts[i]; if (_f.matches(receipt.bloom())) { - auto sha3 = transaction(info.hash, i).sha3(); + auto h = transaction(info.hash, i).sha3(); LogEntries le = _f.matches(receipt); if (le.size()) { @@ -806,7 +806,7 @@ LocalisedLogEntries Client::logs(LogFilter const& _f) const if (s) s--; else - ret.insert(ret.begin(), LocalisedLogEntry(le[j], n, sha3)); + ret.insert(ret.begin(), LocalisedLogEntry(le[j], n, h)); } } } diff --git a/libevm/ExtVMFace.h b/libevm/ExtVMFace.h index 95910d7cb..49535958a 100644 --- a/libevm/ExtVMFace.h +++ b/libevm/ExtVMFace.h @@ -63,7 +63,7 @@ using LogEntries = std::vector; struct LocalisedLogEntry: public LogEntry { LocalisedLogEntry() {} - LocalisedLogEntry(LogEntry const& _le, unsigned _number, h256 _sha3 = h256(u256(0))): LogEntry(_le), number(_number), sha3(_sha3) {} + LocalisedLogEntry(LogEntry const& _le, unsigned _number, h256 _sha3 = {}): LogEntry(_le), number(_number), sha3(_sha3) {} unsigned number = 0; h256 sha3;