From 8e3e46cdb1436e0785e167aeec773c26f8fe5528 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 13 Aug 2024 10:24:08 +0000 Subject: [PATCH 1/2] Namecoin: delete superfluous whitespace I assume this was there due to a typo. --- src/names/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/names/common.h b/src/names/common.h index 9914fbfc70..eace20b838 100644 --- a/src/names/common.h +++ b/src/names/common.h @@ -383,7 +383,7 @@ class CNameCache inline bool isDeleted (const valtype& name) const { - return (deleted.count (name) > 0); + return (deleted.count (name) > 0); } /* Try to get a name's associated data. This looks only From 44475726ecd87c370a203cf2fcaebf24e9efe583 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 13 Aug 2024 10:28:24 +0000 Subject: [PATCH 2/2] Namecoin: use internal endian conversion functions Upstream Bitcoin Core refactored their endian conversion in 86b7f28d6c507155a9d3a15487ee883989b88943; make Namecoin follow suit. Fixes a Guix build fail for Windows/x86_64 target. --- src/names/common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/names/common.h b/src/names/common.h index eace20b838..61ad08297e 100644 --- a/src/names/common.h +++ b/src/names/common.h @@ -281,7 +281,7 @@ class CNameCache Serialize (Stream& s) const { /* Flip the byte order of nHeight to big endian. */ - const uint32_t nHeightFlipped = htobe32 (nHeight); + const uint32_t nHeightFlipped = htobe32_internal (nHeight); ::Serialize (s, nHeightFlipped); ::Serialize (s, name); @@ -297,7 +297,7 @@ class CNameCache ::Unserialize (s, name); /* Unflip the byte order. */ - nHeight = be32toh (nHeightFlipped); + nHeight = be32toh_internal (nHeightFlipped); } friend inline bool