mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-05 14:06:27 -05:00
Merge #19705: Shrink CAddress from 48 to 40 bytes on x64
767073fb96
Shrink CAddress from 48 to 40 bytes on x64 (Vasil Dimov) Pull request description: `CAddress` inherits `CService` which is 28 bytes (on 64 bit machines). `CAddress` then adds two member variables - one that requires 4 byte alignment (`nTime`) and one that requires 8 byte alignment (`nServices`). Declare the smaller one first so that it fits in bytes 29..32. On 32 bit machines this change has no effect and `CAddress` remains 40 bytes. ACKs for top commit: laanwj: ACK767073fb96
theStack: ACK767073fb96
Tree-SHA512: 73d6a4fcfa2687b4076950801871252e369510ecf09f820576dbeca9ee3ee94d14672e7d5596cb45fedd9e4b973dd0716a2ea3f13fc3058b4b697d036a7c9db0
This commit is contained in:
commit
ffad348167
1 changed files with 2 additions and 1 deletions
|
@ -374,9 +374,10 @@ public:
|
||||||
READWRITEAS(CService, obj);
|
READWRITEAS(CService, obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
ServiceFlags nServices{NODE_NONE};
|
|
||||||
// disk and network only
|
// disk and network only
|
||||||
uint32_t nTime{TIME_INIT};
|
uint32_t nTime{TIME_INIT};
|
||||||
|
|
||||||
|
ServiceFlags nServices{NODE_NONE};
|
||||||
};
|
};
|
||||||
|
|
||||||
/** getdata message type flags */
|
/** getdata message type flags */
|
||||||
|
|
Loading…
Add table
Reference in a new issue