LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

version.h: separate client, net sections. Move more constants to this file.

Browse source 
* 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
This commit is contained in:
Jeff Garzik 2012-04-12 12:23:58 -04:00 committed by Jeff Garzik
parent 93e447b631
commit b87c0fc440
3 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/serialize.h
View file

@ -20,6 +20,7 @@
#include <boost/tuple/tuple_io.hpp> #include <boost/tuple/tuple_io.hpp>
#include "allocators.h" #include "allocators.h"
#include "version.h"
typedef long long int64; typedef long long int64;
typedef unsigned long long uint64; typedef unsigned long long uint64;
@ -29,8 +30,6 @@ class CDataStream;
class CAutoFile; class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000; static const unsigned int MAX_SIZE = 0x02000000;
static const int PROTOCOL_VERSION = 60000;
// Used to bypass the rule against non-const reference to temporary // Used to bypass the rule against non-const reference to temporary
// where it makes sense with wrappers such as CFlatData or CTxDB // where it makes sense with wrappers such as CFlatData or CTxDB
template<typename T> template<typename T>

10
src/version.cpp
View file

@ -11,18 +11,8 @@
const std::string CLIENT_NAME("Satoshi"); const std::string CLIENT_NAME("Satoshi");
// Client version number // 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" #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. // The following part of the code determines the CLIENT_BUILD variable.
// Several mechanisms are used for this: // Several mechanisms are used for this:

24
src/version.h
View file

@ -6,12 +6,32 @@
#include <string> #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_NAME;
extern const std::string CLIENT_BUILD; extern const std::string CLIENT_BUILD;
extern const std::string CLIENT_DATE; 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 // BIP 0031, pong message, is enabled for all versions AFTER this one
const int BIP0031_VERSION = 60000; static const int BIP0031_VERSION = 60000;
#endif #endif