aboutsummaryrefslogtreecommitdiff
path: root/src/checkpoints.cpp
diff options
context:
space:
mode:
authorBrandon Dahler <brandon.dahler@gmail.com>2013-04-13 00:13:08 -0500
committerBrandon Dahler <brandon.dahler@gmail.com>2013-11-10 09:36:28 -0600
commit51ed9ec971614aebdbfbd9527aba365dd0afd437 (patch)
treed2f910390e55aef857023812fbdaefdd66cd99ff /src/checkpoints.cpp
parent7c4c207be8420d394a5abc4368d1bb69ad4f8067 (diff)
downloadbitcoin-51ed9ec971614aebdbfbd9527aba365dd0afd437.tar.xz
Cleanup code using forward declarations.
Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
Diffstat (limited to 'src/checkpoints.cpp')
-rw-r--r--src/checkpoints.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index 76ae911a5c..40dd30d1a4 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)