From ea3c727e029de09cfa664bc7db5fa3a008d140dd Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com> Date: Sat, 7 Dec 2024 18:41:59 +0000 Subject: [PATCH] merge bitcoin#25245: Remove no-op TIME_INIT on deser --- src/protocol.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/protocol.h b/src/protocol.h index 9a9f1cb4ca..9d294b82e1 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -3,10 +3,6 @@ // Distributed under the MIT 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 BITCOIN_PROTOCOL_H #define BITCOIN_PROTOCOL_H @@ -15,13 +11,10 @@ #include #include #include -#include - #include - +#include #include -#include #include /** Message header. @@ -467,7 +460,6 @@ public: use_v2 = s.GetVersion() & ADDRV2_FORMAT; } - SER_READ(obj, obj.nTime = TIME_INIT); READWRITE(obj.nTime); // nServices is serialized as CompactSize in V2; as uint64_t in V1. if (use_v2) {