From 21e43de0f300ee47b7e597098908601bf591950b Mon Sep 17 00:00:00 2001
From: Jeffrey <jeffryan@tamu.edu>
Date: Sun, 6 Mar 2022 11:15:29 -0600
Subject: [PATCH] Eliminate reliance of abstract_tcp_server2.inl on
 pragma_comp_defs.h

The GCC maybe-uninitialized warning was already taken care of, and
I don't think it's possible (or realistic) to compile monero in vanilla
VS anymore, and the warning 4355 is turned off by default anyways. Also,
on principal, warnings shouldn't be suppressed en masses like they were
before this change, especially for such an important file.
---
 contrib/epee/include/net/abstract_tcp_server2.inl | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 89971bea2..69f800c2b 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -45,7 +45,6 @@
 #include "string_tools_lexical.h"
 #include "misc_language.h"
 #include "net/local_ip.h"
-#include "pragma_comp_defs.h"
 
 #include <sstream>
 #include <iomanip>
@@ -64,7 +63,6 @@
 #define TIMEOUT_EXTRA_MS_PER_BYTE 0.2
 
 
-PRAGMA_WARNING_PUSH
 namespace epee
 {
 namespace net_utils
@@ -79,7 +77,6 @@ namespace net_utils
   /************************************************************************/
   /*                                                                      */
   /************************************************************************/
-PRAGMA_WARNING_DISABLE_VS(4355)
 
   template<class t_protocol_handler>
   connection<t_protocol_handler>::connection( boost::asio::io_service& io_service,
@@ -111,7 +108,6 @@ PRAGMA_WARNING_DISABLE_VS(4355)
     MDEBUG("test, connection constructor set m_connection_type="<<m_connection_type);
   }
 
-PRAGMA_WARNING_DISABLE_VS(4355)
   //---------------------------------------------------------------------------------
   template<class t_protocol_handler>
   connection<t_protocol_handler>::~connection() noexcept(false)
@@ -1092,8 +1088,6 @@ PRAGMA_WARNING_DISABLE_VS(4355)
     }
   }
   //-----------------------------------------------------------------------------
-PUSH_WARNINGS
-DISABLE_GCC_WARNING(maybe-uninitialized)
   template<class t_protocol_handler>
   bool boosted_tcp_server<t_protocol_handler>::init_server(const std::string port,  const std::string& address,
       const std::string port_ipv6, const std::string address_ipv6, bool use_ipv6, bool require_ipv4,
@@ -1113,7 +1107,6 @@ DISABLE_GCC_WARNING(maybe-uninitialized)
     }
     return this->init_server(p, address, p_ipv6, address_ipv6, use_ipv6, require_ipv4, std::move(ssl_options));
   }
-POP_WARNINGS
   //---------------------------------------------------------------------------------
   template<class t_protocol_handler>
   bool boosted_tcp_server<t_protocol_handler>::worker_thread()
@@ -1734,4 +1727,3 @@ POP_WARNINGS
   
 } // namespace
 } // namespace
-PRAGMA_WARNING_POP