mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge a19563ac86 into merged_master (Bitcoin PR bitcoin/bitcoin#30316)
This commit is contained in:
commit
59a40df21e
5 changed files with 6 additions and 7 deletions
|
|
@ -1167,7 +1167,7 @@ private:
|
|||
void PushAddress(Peer& peer, const CAddress& addr) EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex);
|
||||
};
|
||||
|
||||
const CNodeState* PeerManagerImpl::State(NodeId pnode) const EXCLUSIVE_LOCKS_REQUIRED(cs_main)
|
||||
const CNodeState* PeerManagerImpl::State(NodeId pnode) const
|
||||
{
|
||||
std::map<NodeId, CNodeState>::const_iterator it = m_node_states.find(pnode);
|
||||
if (it == m_node_states.end())
|
||||
|
|
@ -1175,7 +1175,7 @@ const CNodeState* PeerManagerImpl::State(NodeId pnode) const EXCLUSIVE_LOCKS_REQ
|
|||
return &it->second;
|
||||
}
|
||||
|
||||
CNodeState* PeerManagerImpl::State(NodeId pnode) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
|
||||
CNodeState* PeerManagerImpl::State(NodeId pnode)
|
||||
{
|
||||
return const_cast<CNodeState*>(std::as_const(*this).State(pnode));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue