diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-10-18 12:22:22 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-10-18 12:22:22 +0200 |
| commit | d63fabdc62b08390b00f4f32dd478fdf08f56223 (patch) | |
| tree | 1f84dea7a2c246966d02efa27146c0dacd90dacb | |
| parent | Merge pull request #1082 (diff) | |
| parent | patched parameter type bug that was causing failure on 32 bit (diff) | |
| download | monero-d63fabdc62b08390b00f4f32dd478fdf08f56223.tar.xz | |
Merge pull request #1215
a6bc110 patched parameter type bug that was causing failure on 32 bit (Dion Ahmetaj)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 9a44d9d3f..a82d96416 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -616,7 +616,7 @@ namespace cryptonote return true; } //----------------------------------------------------------------------------------------------- - std::pair<uint64_t, uint64_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count) + std::pair<uint64_t, uint64_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const size_t count) { std::list<block> blocks; std::list<transaction> txs; diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h index 407e89197..d925a184d 100644 --- a/src/cryptonote_core/cryptonote_core.h +++ b/src/cryptonote_core/cryptonote_core.h @@ -605,7 +605,7 @@ namespace cryptonote * * @return the number of blocks to sync in one go */ - std::pair<uint64_t, uint64_t> get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count); + std::pair<uint64_t, uint64_t> get_coinbase_tx_sum(const uint64_t start_offset, const size_t count); private: |