Merge branch 'master' of github.com:novacoin-project/novacoin

[novacoin.git] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index b4ebac6..fcc8c9e 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -17,9 +17,9 @@
 #include "uint256.h"
 
 extern bool fTestNet;
-static inline unsigned short GetDefaultPort(const bool testnet = fTestNet)
+inline unsigned short GetDefaultPort()
 {
-    return static_cast<unsigned short>(testnet ? 17777 : 7777);
+    return static_cast<unsigned short>(fTestNet ? 17777 : 7777);
 }
 
 
@@ -93,8 +93,6 @@ class CAddress : public CService
              READWRITE(*pip);
             )
 
-        void print() const;
-
     // TODO: make private (improves encapsulation)
     public:
         uint64_t nServices;
@@ -125,7 +123,6 @@ class CInv
         bool IsKnownType() const;
         const char* GetCommand() const;
         std::string ToString() const;
-        void print() const;
 
     // TODO: make private (improves encapsulation)
     public: