bitcoin/bitcoin
1
1
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-05-17 23:56:39 +00:00
Code Issues Releases Activity

refactor: Remove unused gcc-9 workaround in txrequest

Browse Source
This commit is contained in:
MarcoFalke 2023-08-27 09:53:24 +02:00
parent fa918d397d
commit fa5423b5b5
No known key found for this signature in database
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/txrequest.cpp
View File

@ -72,16 +72,10 @@ struct Announcement {
/** Whether this is a wtxid request. */ /** Whether this is a wtxid request. */
const bool m_is_wtxid : 1; const bool m_is_wtxid : 1;
/** What state this announcement is in. /** What state this announcement is in. */
* This is a uint8_t instead of a State to silence a GCC warning in versions prior to 9.3. State m_state : 3;
* See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414 */ State GetState() const { return m_state; }
uint8_t m_state : 3; void SetState(State state) { m_state = state; }
/** Convert m_state to a State enum. */
State GetState() const { return static_cast<State>(m_state); }
/** Convert a State enum to a uint8_t and store it in m_state. */
void SetState(State state) { m_state = static_cast<uint8_t>(state); }
/** Whether this announcement is selected. There can be at most 1 selected peer per txhash. */ /** Whether this announcement is selected. There can be at most 1 selected peer per txhash. */
bool IsSelected() const bool IsSelected() const
@ -105,7 +99,7 @@ struct Announcement {
Announcement(const GenTxid& gtxid, NodeId peer, bool preferred, std::chrono::microseconds reqtime, Announcement(const GenTxid& gtxid, NodeId peer, bool preferred, std::chrono::microseconds reqtime,
SequenceNumber sequence) : SequenceNumber sequence) :
m_txhash(gtxid.GetHash()), m_time(reqtime), m_peer(peer), m_sequence(sequence), m_preferred(preferred), m_txhash(gtxid.GetHash()), m_time(reqtime), m_peer(peer), m_sequence(sequence), m_preferred(preferred),
m_is_wtxid(gtxid.IsWtxid()), m_state(static_cast<uint8_t>(State::CANDIDATE_DELAYED)) {} m_is_wtxid{gtxid.IsWtxid()}, m_state{State::CANDIDATE_DELAYED} {}
}; };
//! Type alias for priorities. //! Type alias for priorities.