diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-11-03 14:55:28 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-11-03 15:03:28 +0100 |
| commit | 4e852e57b1732026722056a6bf22dfcf3f5dd53d (patch) | |
| tree | 5c879c7c8a034c44314d16838a5092ae85e0b018 /src/txmempool.cpp | |
| parent | Merge pull request #5106 (diff) | |
| parent | minor cleanup: include orders, end comments etc. (diff) | |
| download | discoin-4e852e57b1732026722056a6bf22dfcf3f5dd53d.tar.xz discoin-4e852e57b1732026722056a6bf22dfcf3f5dd53d.zip | |
Merge pull request #5186
771d500 minor cleanup: include orders, end comments etc. (Philip Kaufmann)
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index d3d9cb8a0..b5070d510 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -332,7 +332,7 @@ public: size_t numEntries; filein >> numEntries; if (numEntries <= 0 || numEntries > 10000) - throw runtime_error("Corrupt estimates file. Must have between 1 and 10k entires."); + throw runtime_error("Corrupt estimates file. Must have between 1 and 10k entires."); std::vector<CBlockAverage> fileHistory; @@ -343,8 +343,8 @@ public: fileHistory.push_back(entry); } - //Now that we've processed the entire fee estimate data file and not - //thrown any errors, we can copy it to our history + // Now that we've processed the entire fee estimate data file and not + // thrown any errors, we can copy it to our history nBestSeenHeight = nFileBestSeenHeight; history = fileHistory; assert(history.size() > 0); |