net: Use C++11 member initialization in protocol

bitcoin · May 19, 2020 · eac91b0 · eac91b0
1 parent 916e82c
commit eac91b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -147,24 +147,6 @@ void SetServiceFlagsIBDCache(bool state) {
     g_initial_block_download_completed = state;
 }
 
-
-CAddress::CAddress() : CService()
-{
-    Init();
-}
-
-CAddress::CAddress(CService ipIn, ServiceFlags nServicesIn) : CService(ipIn)
-{
-    Init();
-    nServices = nServicesIn;
-}
-
-void CAddress::Init()
-{
-    nServices = NODE_NONE;
-    nTime = 100000000;
-}
-
 CInv::CInv()
 {
     type = 0;

diff --git a/src/protocol.h b/src/protocol.h
@@ -329,14 +329,11 @@ static inline bool MayHaveUsefulAddressDB(ServiceFlags services)
 class CAddress : public CService
 {
 public:
-    CAddress();
-    explicit CAddress(CService ipIn, ServiceFlags nServicesIn);
-
-    void Init();
+    CAddress() : CService{} {};
+    explicit CAddress(CService ipIn, ServiceFlags nServicesIn) : CService{ipIn}, nServices{nServicesIn} {};
 
     SERIALIZE_METHODS(CAddress, obj)
     {
-        SER_READ(obj, obj.Init());
         int nVersion = s.GetVersion();
         if (s.GetType() & SER_DISK) {
             READWRITE(nVersion);
@@ -349,10 +346,9 @@ class CAddress : public CService
         READWRITEAS(CService, obj);
     }
 
-    ServiceFlags nServices;
-
+    ServiceFlags nServices{NODE_NONE};
     // disk and network only
-    unsigned int nTime;
+    unsigned int nTime{100000000};
 };
 
 /** getdata message type flags */