diff options
| author | Pieter Wuille <[email protected]> | 2013-11-10 19:19:30 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-11-10 19:21:03 +0100 |
| commit | f76c122e2eac8ef66f69d142231bd33c88a24c50 (patch) | |
| tree | d2f910390e55aef857023812fbdaefdd66cd99ff /src/checkpoints.cpp | |
| parent | Merge pull request #3211 (diff) | |
| parent | Cleanup code using forward declarations. (diff) | |
| download | discoin-f76c122e2eac8ef66f69d142231bd33c88a24c50.tar.xz discoin-f76c122e2eac8ef66f69d142231bd33c88a24c50.zip | |
Merge pull request #2767
51ed9ec Cleanup code using forward declarations. (Brandon Dahler)
Diffstat (limited to 'src/checkpoints.cpp')
| -rw-r--r-- | src/checkpoints.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 76ae911a5..40dd30d1a 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -2,14 +2,16 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <boost/assign/list_of.hpp> // for 'map_list_of()' -#include <boost/foreach.hpp> - #include "checkpoints.h" #include "main.h" #include "uint256.h" +#include <stdint.h> + +#include <boost/assign/list_of.hpp> // for 'map_list_of()' +#include <boost/foreach.hpp> + namespace Checkpoints { typedef std::map<int, uint256> MapCheckpoints; @@ -23,8 +25,8 @@ namespace Checkpoints struct CCheckpointData { const MapCheckpoints *mapCheckpoints; - int64 nTimeLastCheckpoint; - int64 nTransactionsLastCheckpoint; + int64_t nTimeLastCheckpoint; + int64_t nTransactionsLastCheckpoint; double fTransactionsPerDay; }; @@ -105,7 +107,7 @@ namespace Checkpoints if (pindex==NULL) return 0.0; - int64 nNow = time(NULL); + int64_t nNow = time(NULL); double fWorkBefore = 0.0; // Amount of work done before pindex double fWorkAfter = 0.0; // Amount of work left after pindex (estimated) |