From 461f9abcc90c53dfa24dde08a2c4161a40be18fe Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 26 Mar 2023 00:16:51 -0700
Subject: [PATCH] - pulling in std::back_insterter under MSVC - MSVC needs a
 return value even with unreachable code

---
 src/KqueueEventPoll.cc             | 2 +-
 src/ReceiverMSEHandshakeCommand.cc | 5 +++++
 src/RpcMethodImpl.h                | 4 ++++
 src/SSHSession.cc                  | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/KqueueEventPoll.cc b/src/KqueueEventPoll.cc
index ef96478e..96b7e883 100644
--- a/src/KqueueEventPoll.cc
+++ b/src/KqueueEventPoll.cc
@@ -97,7 +97,7 @@ KqueueEventPoll::KqueueEventPoll()
 KqueueEventPoll::~KqueueEventPoll()
 {
   if (kqfd_ != -1) {
-    int r = close(kqfd_);
+    int r = a2_close(kqfd_);
     int errNum = errno;
     if (r == -1) {
       A2_LOG_ERROR(fmt("Error occurred while closing kqueue file descriptor"
diff --git a/src/ReceiverMSEHandshakeCommand.cc b/src/ReceiverMSEHandshakeCommand.cc
index 90ba5585..52e51382 100644
--- a/src/ReceiverMSEHandshakeCommand.cc
+++ b/src/ReceiverMSEHandshakeCommand.cc
@@ -32,6 +32,11 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
+
+#if defined(_MSC_VER) // for std::back_inserter
+#  include <iterator>
+#endif
+
 #include "ReceiverMSEHandshakeCommand.h"
 #include "PeerReceiveHandshakeCommand.h"
 #include "PeerConnection.h"
diff --git a/src/RpcMethodImpl.h b/src/RpcMethodImpl.h
index de6d7685..7f1f3661 100644
--- a/src/RpcMethodImpl.h
+++ b/src/RpcMethodImpl.h
@@ -41,6 +41,10 @@
 #include <deque>
 #include <algorithm>
 
+#if defined(_MSC_VER) // for std::back_inserter
+#  include <iterator>
+#endif
+
 #include "RpcRequest.h"
 #include "ValueBase.h"
 #include "TorrentAttribute.h"
diff --git a/src/SSHSession.cc b/src/SSHSession.cc
index 5f1ac4b0..b50a725c 100644
--- a/src/SSHSession.cc
+++ b/src/SSHSession.cc
@@ -145,6 +145,7 @@ ssize_t SSHSession::writeData(const void* data, size_t len)
 {
   // net implemented yet
   assert(0);
+  return 0; // MSVC needs a return value even if it's unreached
 }
 
 ssize_t SSHSession::readData(void* data, size_t len)