Merge pull request #1215

a6bc110 patched parameter type bug that was causing failure on 32 bit (Dion Ahmetaj)
This commit is contained in:
Riccardo Spagni 2016-10-18 12:22:22 +02:00
commit d63fabdc62
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 2 deletions

View file

@ -616,7 +616,7 @@ namespace cryptonote
return true; 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<block> blocks;
std::list<transaction> txs; std::list<transaction> txs;

View file

@ -605,7 +605,7 @@ namespace cryptonote
* *
* @return the number of blocks to sync in one go * @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: private: