From 8db728bfe0ef69997cdf4cde82865ddd504c7f4e Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 5 May 2022 13:47:11 +0200
Subject: [PATCH 1/3] Always return a value from waitOnSocketData() (#518)

My guess is that the else part is what we will want to return if no
other case catches.

In any case we need a return value to prevent:
`error: control reaches end of non-void function [-Werror=return-type]`
---
 src/base/Headers.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/base/Headers.hpp b/src/base/Headers.hpp
index c5f9ba43f..762969728 100644
--- a/src/base/Headers.hpp
+++ b/src/base/Headers.hpp
@@ -353,9 +353,8 @@ inline bool waitOnSocketData(int fd) {
     } else {
       FATAL_FAIL(selectResult);
     }
-  } else {
-    return FD_ISSET(fd, &fdset);
   }
+  return FD_ISSET(fd, &fdset);
 }
 
 inline string genRandomAlphaNum(int len) {

From 92364d29fd71c517681cc425b5f42bce32e61c53 Mon Sep 17 00:00:00 2001
From: Jason Gauci <jgmath2000@gmail.com>
Date: Thu, 5 May 2022 06:37:55 -0700
Subject: [PATCH 2/3] Add optional header (#519)

---
 src/base/Headers.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/base/Headers.hpp b/src/base/Headers.hpp
index 762969728..e9b06a860 100644
--- a/src/base/Headers.hpp
+++ b/src/base/Headers.hpp
@@ -73,6 +73,7 @@ inline int close(int fd) { return ::closesocket(fd); }
 #include <locale>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <streambuf>
@@ -88,7 +89,8 @@ inline int close(int fd) { return ::closesocket(fd); }
 #include <Availability.h>
 #endif
 
-#if defined(__APPLE__) && __MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
+#if defined(__APPLE__) && \
+    __MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
 #if __has_include(<boost/filesystem.hpp>)
 #include <boost/filesystem.hpp>
 namespace fs = boost::filesystem;

From 113fb23133eabce3d11681392d75ba4772814b44 Mon Sep 17 00:00:00 2001
From: Jason Gauci <jgmath2000@gmail.com>
Date: Thu, 5 May 2022 10:20:27 -0500
Subject: [PATCH 3/3] v6.2.1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5a8fb16b..79ec1291c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ endif()
 message(STATUS "VCPKG TRIPLET: ${VCPKG_TARGET_TRIPLET}")
 
 # Don't specify languages yet in case we need to bump the cmake version
-project(EternalTCP VERSION 6.2.0 LANGUAGES NONE)
+project(EternalTCP VERSION 6.2.1 LANGUAGES NONE)
 
 if(WIN32)
 message(STATUS "Windows detected.  Bumping up cmake version.")