BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use compile-time constants instead of unnamed enumerations (remove "enum hack")

This commit is contained in:
practicalswift 2017-07-05 16:49:57 +02:00
parent 1caafa6cde
commit 1e65f0f339
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arith_uint256.h
View File

@ -25,7 +25,7 @@ template<unsigned int BITS>
class base_uint class base_uint
{ {
protected: protected:
enum { WIDTH=BITS/32 }; static constexpr int WIDTH = BITS / 32;
uint32_t pn[WIDTH]; uint32_t pn[WIDTH];
public: public:

2
src/chain.h
View File

@ -304,7 +304,7 @@ public:
return (int64_t)nTimeMax; return (int64_t)nTimeMax;
} }
enum { nMedianTimeSpan=11 }; static constexpr int nMedianTimeSpan = 11;
int64_t GetMedianTimePast() const int64_t GetMedianTimePast() const
{ {

11
src/consensus/consensus.h
View File

@ -24,12 +24,9 @@ static const size_t MIN_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * 60; // 60 is
static const size_t MIN_SERIALIZABLE_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * 10; // 10 is the lower bound for the size of a serialized CTransaction static const size_t MIN_SERIALIZABLE_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * 10; // 10 is the lower bound for the size of a serialized CTransaction
/** Flags for nSequence and nLockTime locks */ /** Flags for nSequence and nLockTime locks */
enum { /** Interpret sequence numbers as relative lock-time constraints. */
/* Interpret sequence numbers as relative lock-time constraints. */ static constexpr unsigned int LOCKTIME_VERIFY_SEQUENCE = (1 << 0);
LOCKTIME_VERIFY_SEQUENCE = (1 << 0), /** Use GetMedianTimePast() instead of nTime for end point timestamp. */
static constexpr unsigned int LOCKTIME_MEDIAN_TIME_PAST = (1 << 1);
/* Use GetMedianTimePast() instead of nTime for end point timestamp. */
LOCKTIME_MEDIAN_TIME_PAST = (1 << 1),
};
#endif // BITCOIN_CONSENSUS_CONSENSUS_H #endif // BITCOIN_CONSENSUS_CONSENSUS_H

17
src/protocol.h
View File

@ -27,16 +27,13 @@
class CMessageHeader class CMessageHeader
{ {
public: public:
enum { static constexpr size_t MESSAGE_START_SIZE = 4;
MESSAGE_START_SIZE = 4, static constexpr size_t COMMAND_SIZE = 12;
COMMAND_SIZE = 12, static constexpr size_t MESSAGE_SIZE_SIZE = 4;
MESSAGE_SIZE_SIZE = 4, static constexpr size_t CHECKSUM_SIZE = 4;
CHECKSUM_SIZE = 4, static constexpr size_t MESSAGE_SIZE_OFFSET = MESSAGE_START_SIZE + COMMAND_SIZE;
static constexpr size_t CHECKSUM_OFFSET = MESSAGE_SIZE_OFFSET + MESSAGE_SIZE_SIZE;
MESSAGE_SIZE_OFFSET = MESSAGE_START_SIZE + COMMAND_SIZE, static constexpr size_t HEADER_SIZE = MESSAGE_START_SIZE + COMMAND_SIZE + MESSAGE_SIZE_SIZE + CHECKSUM_SIZE;
CHECKSUM_OFFSET = MESSAGE_SIZE_OFFSET + MESSAGE_SIZE_SIZE,
HEADER_SIZE = MESSAGE_START_SIZE + COMMAND_SIZE + MESSAGE_SIZE_SIZE + CHECKSUM_SIZE
};
typedef unsigned char MessageStartChars[MESSAGE_START_SIZE]; typedef unsigned char MessageStartChars[MESSAGE_START_SIZE];
CMessageHeader(const MessageStartChars& pchMessageStartIn); CMessageHeader(const MessageStartChars& pchMessageStartIn);

2
src/uint256.h
View File

@ -19,7 +19,7 @@ template<unsigned int BITS>
class base_blob class base_blob
{ {
protected: protected:
enum { WIDTH=BITS/8 }; static constexpr int WIDTH = BITS / 8;
uint8_t data[WIDTH]; uint8_t data[WIDTH];
public: public:
base_blob() base_blob()