Merge branch 'wl12611' Remove warnings from Visual Studio 2017

Author: Bogdan Degtyariov

cdk/core/codec.cc

@@ -30,12 +30,12 @@
 
 
 #include <mysql/cdk/codec.h>
-#include <sstream>
 #include "../parser/json_parser.h"
 
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
+#include <sstream>
 #include <algorithm>  // std::min
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 // Include Protobuf headers needed for decoding float numbers
 

cdk/foundation/connection_openssl.cc

@@ -32,7 +32,7 @@
 //include socket_detail.h before ssl.h because it includes winsock2.h
 //which must be included before winsock.h
 #include "socket_detail.h"
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 #include <openssl/ssl.h>
 #ifdef WITH_SSL_WOLFSSL
 
@@ -45,7 +45,7 @@ PUSH_SYS_WARNINGS
 #else
 #include <openssl/err.h>
 #endif
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 #include <mysql/cdk/foundation/error.h>
 #include <mysql/cdk/foundation/connection_openssl.h>
 #include <mysql/cdk/foundation/opaque_impl.i>
@@ -296,7 +296,11 @@ void connection_TLS_impl::do_connect()
         cdk::foundation::connection::TLS::Options::SSL_MODE::VERIFY_CA
         )
     {
-      SSL_CTX_set_verify(m_tls_ctx, SSL_VERIFY_PEER , NULL);
+      /*
+        Warnings must be disabled because of a bug in Visual Studio 2017 compiler:
+        https://developercommunity.visualstudio.com/content/problem/130244/c-warning-c5039-reported-for-nullptr-argument.html
+      */
+      SSL_CTX_set_verify(m_tls_ctx, SSL_VERIFY_PEER, nullptr);
 
       if (SSL_CTX_load_verify_locations(
             m_tls_ctx,
@@ -307,7 +311,7 @@ void connection_TLS_impl::do_connect()
     }
     else
     {
-      SSL_CTX_set_verify(m_tls_ctx, SSL_VERIFY_NONE, 0);
+      SSL_CTX_set_verify(m_tls_ctx, SSL_VERIFY_NONE, nullptr);
     }
 
     m_tls = SSL_new(m_tls_ctx);

cdk/foundation/connection_tcpip.cc

@@ -419,10 +419,10 @@ void Socket_base::flush()
 }
 
 
-DIAGNOSTIC_PUSH
+DIAGNOSTIC_PUSH_CDK
 #ifdef _MSC_VER
   // 4702 = unreachable code
-  DISABLE_WARNING(4702)
+  DISABLE_WARNING_CDK(4702)
 #endif // _MSC_VER
 
 cdk::foundation::error_condition
@@ -445,7 +445,7 @@ error_category_io::do_default_error_condition(int errc) const
   return errc::no_error;
 }
 
-DIAGNOSTIC_POP
+DIAGNOSTIC_POP_CDK
 
 
 bool

cdk/foundation/connection_tcpip_base.h

@@ -31,9 +31,9 @@
 #ifndef IMPL_FOUNDATION_CONNECTION_TCPIP_BASE_H
 #define IMPL_FOUNDATION_CONNECTION_TCPIP_BASE_H
 
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 #include <sys/types.h>
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 #include "socket_detail.h"
 

cdk/foundation/diagnostics.cc

@@ -30,9 +30,9 @@
 
 #include <mysql/cdk/foundation/diagnostics.h>
 
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 #include <algorithm>
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 using namespace cdk;
 

cdk/foundation/error.cc

@@ -35,10 +35,10 @@
 
 #include <mysql/cdk/foundation/error.h>
 
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 #include <stdexcept>
 #include <sstream>
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 
 namespace cdk {

cdk/foundation/socket_detail.cc

@@ -31,7 +31,7 @@
 #include "socket_detail.h"
 #include <mysql/cdk/foundation/error.h>
 #include <mysql/cdk/foundation/connection_tcpip.h>
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 #include "openssl/ssl.h"
 
 // Wolfssl redefines close, which causes compiler errors in VS.
@@ -49,7 +49,7 @@ PUSH_SYS_WARNINGS
 #include <signal.h>
 #include <sys/un.h>
 #endif
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 using namespace std::chrono;
 
@@ -75,10 +75,10 @@ class error_category_winsock : public error_category_base
   const char* name() const NOEXCEPT { return "winsock"; }
   std::string message(int) const;
 
-DIAGNOSTIC_PUSH
+DIAGNOSTIC_PUSH_CDK
 #ifdef _MSC_VER
   // 4702 = unreachable code
-  DISABLE_WARNING(4702)
+  DISABLE_WARNING_CDK(4702)
 #endif // _MSC_VER
 
   error_condition do_default_error_condition(int code) const
@@ -122,7 +122,7 @@ DIAGNOSTIC_PUSH
     }
   }
 
-DIAGNOSTIC_POP
+DIAGNOSTIC_POP_CDK
 
   bool do_equivalent(int code, const error_condition &ec) const
   {
@@ -201,10 +201,10 @@ class error_category_resolve : public error_category_base
   const char* name() const NOEXCEPT { return "resolve"; }
   std::string message(int code) const;
 
-DIAGNOSTIC_PUSH
+DIAGNOSTIC_PUSH_CDK
 #ifdef _MSC_VER
   // 4702 = unreachable code
-  DISABLE_WARNING(4702)
+  DISABLE_WARNING_CDK(4702)
 #endif // _MSC_VER
 
   error_condition do_default_error_condition(int code) const
@@ -250,7 +250,7 @@ DIAGNOSTIC_PUSH
     }
   }
 
-DIAGNOSTIC_POP
+DIAGNOSTIC_POP_CDK
 
   bool do_equivalent(int code, const error_condition &ec) const
   {
@@ -541,11 +541,11 @@ addrinfo* addrinfo_from_string(const char* host_name, unsigned short port)
 }
 
 
-DIAGNOSTIC_PUSH
+DIAGNOSTIC_PUSH_CDK
 
 #ifdef _MSC_VER
   // 4189 = local variable is initialized but not referenced
-  DISABLE_WARNING(4189)
+  DISABLE_WARNING_CDK(4189)
 #endif
 
 Socket connect(const char *host_name, unsigned short port,
@@ -650,7 +650,7 @@ Socket connect(const char *host_name, unsigned short port,
   return socket;
 }
 
-DIAGNOSTIC_POP
+DIAGNOSTIC_POP_CDK
 
 #ifndef _WIN32
 Socket connect(const char *path, uint64_t timeout_usec)
@@ -767,12 +767,12 @@ int select_one(Socket socket, Select_mode mode, bool wait,
   // to make select() return immediately
   timeval *select_timeout = &timeout_val;
 
-DIAGNOSTIC_PUSH
+DIAGNOSTIC_PUSH_CDK
 
 #ifdef _WIN32
   // 4548 = expression has no effect
   // This warning is generated by FD_SET
-  DISABLE_WARNING(4548)
+  DISABLE_WARNING_CDK(4548)
 #endif
 
   fd_set socket_set;
@@ -783,7 +783,7 @@ DIAGNOSTIC_PUSH
   FD_ZERO(&except_set);
   FD_SET(socket, &except_set);
 
-DIAGNOSTIC_POP
+DIAGNOSTIC_POP_CDK
 
   if (wait)
   {

cdk/foundation/socket_detail.h

@@ -32,7 +32,7 @@
 #define CDK_FOUNDATION_SOCKET_DETAIL_H
 #include <mysql/cdk/foundation/types.h>
 
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 
 #ifdef _WIN32
 
@@ -59,7 +59,7 @@ PUSH_SYS_WARNINGS
 
 #endif
 
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 
 namespace cdk {

cdk/include/mysql/cdk/data_source.h

@@ -33,11 +33,11 @@
 
 #include <mysql/cdk/foundation.h>
 
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 #include <functional>
 #include <algorithm>
 #include <set>
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 
 namespace cdk {

cdk/include/mysql/cdk/foundation/cdk_time.h

@@ -33,9 +33,9 @@
 
 #include "common.h"
 
-PUSH_SYS_WARNINGS
+PUSH_SYS_WARNINGS_CDK
 #include <time.h>
-POP_SYS_WARNINGS
+POP_SYS_WARNINGS_CDK
 
 namespace cdk {
 namespace foundation {

cdk/include/mysql/cdk/foundation/codec.h

@@ -33,6 +33,9 @@
 
 #include "types.h"
 #include "error.h"
+
+PUSH_SYS_WARNINGS_CDK
+
 #ifdef HAVE_CODECVT_UTF8
 #include <codecvt>
 #else
@@ -42,6 +45,7 @@
 #include <limits>         // for std::numeric_limits
 #include <string.h>       // for memset
 
+POP_SYS_WARNINGS_CDK
 
 namespace cdk {
 namespace foundation {