github-jwinterm/wownero
1
0
Fork 0
mirror of https://github.com/jwinterm/wownero.git synced 2026-10-24 06:38:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1634

Browse Source 
99f58437 Fix invalid + of std::string and int (Timothy D. Prime)
This commit is contained in:
Riccardo Spagni
2017-02-02 19:43:05 +02:00
parent a6f61b8419 99f584376e
commit 5bb95fc613
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/core_rpc_server.cpp
+1 -1
View File
@@ -204,7 +204,7 @@ namespace cryptonote
}
catch (...)
{
res.status = "Error retrieving block at height " + height;
res.status = "Error retrieving block at height " + std::to_string(height);
return true;
}
std::list<transaction> txs;
src/wallet/wallet2.cpp
+3 -3
View File
@@ -5417,9 +5417,9 @@ uint64_t wallet2::get_blockchain_height_by_date(uint16_t year, uint8_t month, ui
throw std::runtime_error(oss.str());
}
cryptonote::block blk_min, blk_mid, blk_max;
if (!parse_and_validate_block_from_blob(res.blocks[0].block, blk_min)) throw std::runtime_error("failed to parse blob at height " + height_min);
if (!parse_and_validate_block_from_blob(res.blocks[1].block, blk_mid)) throw std::runtime_error("failed to parse blob at height " + height_mid);
if (!parse_and_validate_block_from_blob(res.blocks[2].block, blk_max)) throw std::runtime_error("failed to parse blob at height " + height_max);
if (!parse_and_validate_block_from_blob(res.blocks[0].block, blk_min)) throw std::runtime_error("failed to parse blob at height " + std::to_string(height_min));
if (!parse_and_validate_block_from_blob(res.blocks[1].block, blk_mid)) throw std::runtime_error("failed to parse blob at height " + std::to_string(height_mid));
if (!parse_and_validate_block_from_blob(res.blocks[2].block, blk_max)) throw std::runtime_error("failed to parse blob at height " + std::to_string(height_max));
uint64_t timestamp_min = blk_min.timestamp;
uint64_t timestamp_mid = blk_mid.timestamp;
uint64_t timestamp_max = blk_max.timestamp;