From 892dcaa96f1a630890660c076ddf3433741501c8 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Wed, 29 Jun 2022 12:35:27 +0200
Subject: [PATCH] Merge bitcoin/bitcoin#25492: util: remove MSVC warning
 pragmas

d8f8f7812cfa50e853d30f53273601dca57a60ec 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 d8f8f7812cfa50e853d30f53273601dca57a60ec, build [log](https://api.cirrus-ci.com/v1/task/6088784285532160/logs/build.log) is free of warnings.

Tree-SHA512: c8ac4585799996960ea099b2c5337e7bb577152eec2e9543cc459c56f42f7a36fc4dcd7faec2fa4ac159a4ae27859650ccfd96bbf94b94dbd1cbea638560a24f
---
 src/llmq/dkgsessionhandler.cpp | 5 +++--
 src/llmq/dkgsessionhandler.h   | 3 ++-
 src/util/system.cpp            | 7 -------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/llmq/dkgsessionhandler.cpp b/src/llmq/dkgsessionhandler.cpp
index 95b1c0fd3372d5..4f170ea886ae4d 100644
--- a/src/llmq/dkgsessionhandler.cpp
+++ b/src/llmq/dkgsessionhandler.cpp
@@ -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()
diff --git a/src/llmq/dkgsessionhandler.h b/src/llmq/dkgsessionhandler.h
index 6f320894a58ef9..7a48210dd8763d 100644
--- a/src/llmq/dkgsessionhandler.h
+++ b/src/llmq/dkgsessionhandler.h
@@ -27,6 +27,7 @@ class CMasternodeMetaMan;
 class CNode;
 class CSporkManager;
 class PeerManager;
+class PeerManagerImpl;
 
 namespace llmq
 {
@@ -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>
diff --git a/src/util/system.cpp b/src/util/system.cpp
index be227c073fa4a7..b5ae435c94a2ca 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -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 */