WL13133: Fix MSVC2017 warnings

Author: silvakid

cppconn/sqlstring.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -42,7 +42,14 @@ namespace sql
 {
   class CPPCONN_PUBLIC_FUNC SQLString
   {
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
     std::string realStr;
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
 
   public:
 #ifdef _WIN32

driver/mysql_connection.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -178,13 +178,28 @@ class CPPCONN_PUBLIC_FUNC MySQL_Connection : public sql::Connection
   void init(std::map< sql::SQLString, sql::ConnectPropertyVal > & properties);
 
   Driver * driver;
+
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
   boost::shared_ptr< NativeAPI::NativeConnectionWrapper > proxy;
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
 
   /* statement handle to execute queries initiated by driver. Perhaps it is
      a good idea to move it to a separate helper class */
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
   boost::scoped_ptr< ::sql::mysql::MySQL_Statement > service;
 
   boost::scoped_ptr< ::sql::mysql::MySQL_ConnectionData > intern; /* pimpl */
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
 
   /* Prevent use of these */
   MySQL_Connection(const MySQL_Connection &);

driver/mysql_driver.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -57,7 +57,14 @@ namespace NativeAPI
 
 class CPPCONN_PUBLIC_FUNC MySQL_Driver : public sql::Driver
 {
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
   boost::scoped_ptr< ::sql::mysql::NativeAPI::NativeDriverWrapper > proxy;
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
 
 public:
   MySQL_Driver();

driver/mysql_prepared_statement.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -141,7 +141,7 @@ class LongDataSender : public boost::static_visitor<bool>
     while (sent < str->length())
     {
       chunkSize= (sent + MAX_SEND_LONGDATA_CHUNK > str->length()
-            ? str->length() - sent
+            ? static_cast<unsigned int>(str->length() - sent)
             : MAX_SEND_LONGDATA_CHUNK);
 
       if (proxy->send_long_data(position, str->c_str() + sent, chunkSize)) {

driver/nativeapi/mysql_native_connection_wrapper.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -383,7 +383,7 @@ MySQL_NativeConnectionWrapper::get_option(::sql::mysql::MySQL_Connection_Options
 int
 MySQL_NativeConnectionWrapper::query(const SQLString & stmt_str)
 {
-  return api->real_query(mysql, stmt_str.c_str(), stmt_str.length());
+  return api->real_query(mysql, stmt_str.c_str(), static_cast<unsigned long>(stmt_str.length()));
 }
 /* }}} */
 

driver/nativeapi/mysql_native_statement_wrapper.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -197,7 +197,7 @@ MySQL_NativeStatementWrapper::param_count()
 int
 MySQL_NativeStatementWrapper::prepare(const ::sql::SQLString & stmt_str)
 {
-  return api->stmt_prepare(stmt, stmt_str.c_str(), stmt_str.length());
+  return api->stmt_prepare(stmt, stmt_str.c_str(), static_cast<unsigned long>(stmt_str.length()));
 }
 /* }}} */
 
@@ -206,7 +206,7 @@ MySQL_NativeStatementWrapper::prepare(const ::sql::SQLString & stmt_str)
 NativeResultsetWrapper *
 MySQL_NativeStatementWrapper::result_metadata()
 {
-	::MYSQL_RES * raw = api->stmt_result_metadata(stmt);
+  ::MYSQL_RES * raw = api->stmt_result_metadata(stmt);
 
   if (raw == NULL) {
     return NULL;

examples/dynamic_load.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -313,7 +313,7 @@ static void validateResultSet(boost::scoped_ptr< sql::ResultSet > & res, struct
   validateRow(res, max);
   /* Another way to move after the last entry */
   cout << "#\t Trying absolute(NUMROWS + 10) to move cursor after last row and fetch last entry..." << endl;
-  if (false != res->absolute(res->rowsCount() + 10)) {
+  if (false != res->absolute(static_cast<int>(res->rowsCount() + 10))) {
     throw runtime_error("Call did fail although parameter is valid");
   }
   if (true != res->isAfterLast()) {

examples/resultset.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -277,7 +277,7 @@ static void validateResultSet(boost::scoped_ptr< sql::ResultSet > & res, struct
   validateRow(res, max);
   /* Another way to move after the last entry */
   cout << "#\t Trying absolute(NUMROWS + 10) to move cursor after last row and fetch last entry..." << endl;
-  if (false != res->absolute(res->rowsCount() + 10)) {
+  if (false != res->absolute(static_cast<int>(res->rowsCount() + 10))) {
     throw runtime_error("Call did fail although parameter is valid");
   }
   if (true != res->isAfterLast()) {

test/framework/test_case.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -47,7 +47,7 @@
 
 namespace testsuite
 {
-  _ABSTRACT class Test: virtual private Private::TestContainer
+  _ABSTRACT class Test: virtual public Private::TestContainer
   {
     friend class Private::TestContainer::StorableTest;
 

test/unit/bugs/bugs.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -309,7 +309,7 @@ void bugs::expired_pwd()
       SKIP("The expired password does not work with anonymous-user accounts.");
     }
   }
-  catch (sql::SQLException &e)
+  catch (sql::SQLException&)
   {
     /* If no anonymous user present then continue */
   }
@@ -884,7 +884,7 @@ void bugs::bug21053335()
       ASSERT(res->wasNull());
       FAIL("Exception was not thrown by wasNull()");
     }
-    catch (sql::SQLException & e)
+    catch (sql::SQLException&)
     {
       // Everything is ok
     }
@@ -899,7 +899,7 @@ void bugs::bug21053335()
 
   }
 
-  catch (sql::SQLException &e)
+  catch (sql::SQLException&)
   {
     FAIL("Exception thrown by wasNull()");
     throw;
@@ -935,7 +935,7 @@ void bugs::bug17218692()
     ASSERT_EQUALS(log.str(), log2.str());
 
   }
-  catch (sql::SQLException & e)
+  catch (sql::SQLException&)
   {
     FAIL("Exception thrown");
     throw;
@@ -966,7 +966,7 @@ void bugs::bug21067193()
     ASSERT_EQUALS(false, res->absolute(std::numeric_limits<int>::min())); //Invalid position, Returns FALSE
 
   }
-  catch (sql::SQLException & e)
+  catch (sql::SQLException&)
   {
 //	Error....
       throw;

test/unit/classes/connection.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -3104,7 +3104,7 @@ void connection::tls_version()
     con.reset(driver->connect(connection_properties));
     FAIL("Wrong TLS version used and still can connect!");
   }
-  catch (sql::SQLException &e)
+  catch (sql::SQLException &)
   {
     //Should FAIL to connect
   }