Browse Source

windows fix

cl-refactor
Marek Kotewicz 10 years ago
committed by debris
parent
commit
6d75a52530
  1. 2
      libethereum/ClientBase.h
  2. 8
      libevm/ExtVMFace.h

2
libethereum/ClientBase.h

@ -176,7 +176,7 @@ protected:
// filters
mutable Mutex x_filtersWatches; ///< Our lock.
std::unordered_map<h256, InstalledFilter> m_filters; ///< The dictionary of filters that are active.
std::unordered_map<h256, h256s> m_specialFilters = {{PendingChangedFilter, {}}, {ChainChangedFilter, {}}};
std::unordered_map<h256, h256s> m_specialFilters = std::unordered_map<h256, std::vector<h256>>{{PendingChangedFilter, {}}, {ChainChangedFilter, {}}};
///< The dictionary of special filters and their additional data
std::map<unsigned, ClientWatch> m_watches; ///< Each and every watch - these reference a filter.
};

8
libevm/ExtVMFace.h

@ -67,15 +67,15 @@ struct LocalisedLogEntry: public LogEntry
explicit LocalisedLogEntry(
LogEntry const& _le,
h256 _special
h256 _special
): LogEntry(_le), special(_special) {};
explicit LocalisedLogEntry(
LogEntry const& _le,
BlockInfo const& _bi,
h256 _th,
unsigned _ti,
unsigned _li
h256 _th,
unsigned _ti,
unsigned _li
): LogEntry(_le), blockHash(_bi.hash()), blockNumber((BlockNumber)_bi.number), transactionHash(_th), transactionIndex(_ti), logIndex(_li), mined(true) {};
h256 blockHash = h256();

Loading…
Cancel
Save