From c6289edd44815a0d42823e8c0f283fc25d7506de Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 12 Jan 2018 08:24:42 -0500
Subject: [PATCH] Try to fix MSVC C4589 warning again (GH #214) This one is a
 chronic problem. It appears Microsoft needs to fix it in their compiler

---
 wait.cpp | 3 +++
 wait.h   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wait.cpp b/wait.cpp
index 3356a0d0..17f42ffe 100644
--- a/wait.cpp
+++ b/wait.cpp
@@ -3,8 +3,11 @@
 #include "pch.h"
 #include "config.h"
 
+// http://connect.microsoft.com/VisualStudio/feedback/details/1581706
+//   and http://github.com/weidai11/cryptopp/issues/214
 #if CRYPTOPP_MSC_VERSION
 # pragma warning(disable: 4189)
+# pragma warning(disable: 4589)
 #endif
 
 #if !defined(NO_OS_DEPENDENCE) && (defined(SOCKETS_AVAILABLE) || defined(WINDOWS_PIPES_AVAILABLE))
diff --git a/wait.h b/wait.h
index 0bd51049..924ed42b 100644
--- a/wait.h
+++ b/wait.h
@@ -34,7 +34,7 @@
 
 // http://connect.microsoft.com/VisualStudio/feedback/details/1581706
 //   and http://github.com/weidai11/cryptopp/issues/214
-#if (CRYPTOPP_MSC_VERSION >= 1900) && (CRYPTOPP_MSC_VERSION < 2000)
+#if (CRYPTOPP_MSC_VERSION >= 1900)
 # pragma warning(push)
 # pragma warning(disable: 4589)
 #endif
@@ -226,7 +226,7 @@ private:
 
 NAMESPACE_END
 
-#if (CRYPTOPP_MSC_VERSION >= 1900) && (CRYPTOPP_MSC_VERSION < 2000)
+#if (CRYPTOPP_MSC_VERSION >= 1900)
 # pragma warning(pop)
 #endif