X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fprotocol.h;h=ece61840d587cb05c9258182cce18c781bb2257f;hb=5f3f7465db4444e49dd4a896f88c090b40d0a303;hp=ed8beab026e3012ed3bb893eb932ef4e75d61d6b;hpb=77a43545b4491b9703d803765da9059d2bdd5aaa;p=novacoin.git diff --git a/src/protocol.h b/src/protocol.h index ed8beab..ece6184 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -13,12 +13,13 @@ #include "serialize.h" #include "netbase.h" #include +#include #include "uint256.h" extern bool fTestNet; -static inline unsigned short GetDefaultPort(const bool testnet = fTestNet) +inline unsigned short GetDefaultPort() { - return testnet ? 17777 : 7777; + return static_cast(fTestNet ? 17777 : 7777); } @@ -67,7 +68,7 @@ class CMessageHeader /** nServices flags */ enum { - NODE_NETWORK = (1 << 0), + NODE_NETWORK = (1 << 0) }; /** A CService with information about it as peer */ @@ -77,8 +78,6 @@ class CAddress : public CService CAddress(); explicit CAddress(CService ipIn, uint64_t nServicesIn=NODE_NETWORK); - void Init(); - IMPLEMENT_SERIALIZE ( CAddress* pthis = const_cast(this);