X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fprotocol.h;h=675c0d82a47f1449b77ca53a0160c100e575d1fa;hb=HEAD;hp=b4ebac666ba3f8a51e736a8ff2dc1bf02d2e1eba;hpb=395b5c44639db6bcb74bf40013a4f726e567afdd;p=novacoin.git diff --git a/src/protocol.h b/src/protocol.h index b4ebac6..675c0d8 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -3,23 +3,18 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef __cplusplus -# error This header can only be compiled as C++. -#endif - #ifndef __INCLUDED_PROTOCOL_H__ #define __INCLUDED_PROTOCOL_H__ #include "serialize.h" #include "netbase.h" -#include -#include #include "uint256.h" +#include "version.h" extern bool fTestNet; -static inline unsigned short GetDefaultPort(const bool testnet = fTestNet) +inline unsigned short GetDefaultPort() { - return static_cast(testnet ? 17777 : 7777); + return static_cast(fTestNet ? 17777 : 7777); } @@ -93,8 +88,6 @@ class CAddress : public CService READWRITE(*pip); ) - void print() const; - // TODO: make private (improves encapsulation) public: uint64_t nServices; @@ -125,7 +118,6 @@ class CInv bool IsKnownType() const; const char* GetCommand() const; std::string ToString() const; - void print() const; // TODO: make private (improves encapsulation) public: