Skip to content

Commit

Permalink
Merge bitcoin#25492: util: remove MSVC warning pragmas
Browse files Browse the repository at this point in the history
d8f8f78 util: remove MSVC warning pragmas (fanquake)

Pull request description:

  4786 - I don't think this exists any more?
  4805 - Is already defined (globally) there.

  Dropped 4717 and 4804, as it seems they are no-longer supressing
  anything.

  See:
  https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warnings-c4000-c5999.

ACKs for top commit:
  hebasto:
    ACK d8f8f78, build [log](https://api.cirrus-ci.com/v1/task/6088784285532160/logs/build.log) is free of warnings.

Tree-SHA512: c8ac4585799996960ea099b2c5337e7bb577152eec2e9543cc459c56f42f7a36fc4dcd7faec2fa4ac159a4ae27859650ccfd96bbf94b94dbd1cbea638560a24f
  • Loading branch information
MacroFake authored and vijaydasmp committed Jan 31, 2025
1 parent 4790f19 commit 892dcaa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
5 changes: 3 additions & 2 deletions src/llmq/dkgsessionhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ bool CDKGPendingMessages::HasSeen(const uint256& hash) const
return seenMessages.count(hash) != 0;
}

void CDKGPendingMessages::Misbehaving(const NodeId from, const int score, PeerManager& peerman)
void CDKGPendingMessages::Misbehaving(const NodeId from, const int score, PeerManagerImpl& peerman)
{
if (from == -1) return;
peerman.Misbehaving(from, score);
PeerRef peer{GetPeerRef(from)};
if (peer) peerman.Misbehaving(*peer, from, score);
}

void CDKGPendingMessages::Clear()
Expand Down
3 changes: 2 additions & 1 deletion src/llmq/dkgsessionhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class CMasternodeMetaMan;
class CNode;
class CSporkManager;
class PeerManager;
class PeerManagerImpl;

namespace llmq
{
Expand Down Expand Up @@ -78,7 +79,7 @@ class CDKGPendingMessages
void PushPendingMessage(NodeId from, CDataStream& vRecv, PeerManager& peerman);
std::list<BinaryMessage> PopPendingMessages(size_t maxCount);
bool HasSeen(const uint256& hash) const;
void Misbehaving(NodeId from, int score, PeerManager& peerman);
void Misbehaving(NodeId from, int score, PeerManagerImpl& peerman);
void Clear();

template <typename Message>
Expand Down
7 changes: 0 additions & 7 deletions src/util/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@

#else

#ifdef _MSC_VER
#pragma warning(disable:4786)
#pragma warning(disable:4804)
#pragma warning(disable:4805)
#pragma warning(disable:4717)
#endif

#include <codecvt>

#include <io.h> /* for _commit */
Expand Down

0 comments on commit 892dcaa

Please sign in to comment.