diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-04-12 12:23:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-04-12 12:23:58 -0400 |
| commit | b87c0fc4403040185b625d1b21bbff0cb7c828d7 (patch) | |
| tree | 087f87f514d5b0af5ec7b0b73b875fe4086e926e | |
| parent | 93e447b631440aee505a7c884a59c0885f9d968c (diff) | |
| download | bitcoin-b87c0fc4403040185b625d1b21bbff0cb7c828d7.tar.xz | |
version.h: separate client, net sections. Move more constants to this file.
* move PROTOCOL_VERSION to version.h
* move CLIENT_VERSION* to version.h, make available past cpp stage
* clearly separate client, network version portions of version.h
| -rw-r--r-- | src/serialize.h | 3 | ||||
| -rw-r--r-- | src/version.cpp | 10 | ||||
| -rw-r--r-- | src/version.h | 24 |
3 files changed, 23 insertions, 14 deletions
diff --git a/src/serialize.h b/src/serialize.h index 2d4aaba6a9..d34f3e557c 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -20,6 +20,7 @@ #include <boost/tuple/tuple_io.hpp> #include "allocators.h" +#include "version.h" typedef long long int64; typedef unsigned long long uint64; @@ -29,8 +30,6 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int PROTOCOL_VERSION = 60000; - // Used to bypass the rule against non-const reference to temporary // where it makes sense with wrappers such as CFlatData or CTxDB template<typename T> diff --git a/src/version.cpp b/src/version.cpp index e1be5f491b..0c1e8bfa80 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -11,18 +11,8 @@ const std::string CLIENT_NAME("Satoshi"); // Client version number -#define CLIENT_VERSION_MAJOR 0 -#define CLIENT_VERSION_MINOR 6 -#define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 99 #define CLIENT_VERSION_SUFFIX "-beta" -const int CLIENT_VERSION = 1000000 * CLIENT_VERSION_MAJOR - + 10000 * CLIENT_VERSION_MINOR - + 100 * CLIENT_VERSION_REVISION - + 1 * CLIENT_VERSION_BUILD; - - // The following part of the code determines the CLIENT_BUILD variable. // Several mechanisms are used for this: diff --git a/src/version.h b/src/version.h index e0e216aad4..1ea1a0dbbb 100644 --- a/src/version.h +++ b/src/version.h @@ -6,12 +6,32 @@ #include <string> +// +// client versioning +// + +static const int CLIENT_VERSION_MAJOR = 0; +static const int CLIENT_VERSION_MINOR = 6; +static const int CLIENT_VERSION_REVISION = 0; +static const int CLIENT_VERSION_BUILD = 99; + +static const int CLIENT_VERSION = + 1000000 * CLIENT_VERSION_MAJOR + + 10000 * CLIENT_VERSION_MINOR + + 100 * CLIENT_VERSION_REVISION + + 1 * CLIENT_VERSION_BUILD; + extern const std::string CLIENT_NAME; extern const std::string CLIENT_BUILD; extern const std::string CLIENT_DATE; -extern const int CLIENT_VERSION; + +// +// network protocol versioning +// + +static const int PROTOCOL_VERSION = 60000; // BIP 0031, pong message, is enabled for all versions AFTER this one -const int BIP0031_VERSION = 60000; +static const int BIP0031_VERSION = 60000; #endif |