Fix C++17 usage warnings.

Windows doesn't define correctly __cplusplus macro...

Author: silvakid

CMakeLists.txt

@@ -219,6 +219,7 @@ if(NOT SHOW_JDBC_WARNINGS)
 
 endif()
 
+
 ############################################################################
 #
 #  Main components and connector library target.

cppconn/exception.h

@@ -41,16 +41,6 @@
 namespace sql
 {
 
-#if (__cplusplus < 201103L)
-#define MEMORY_ALLOC_OPERATORS(Class) \
-  void* operator new(size_t size) throw (std::bad_alloc) { return ::operator new(size); }  \
-  void* operator new(size_t, void*) throw(); \
-  void* operator new(size_t, const std::nothrow_t&) throw(); \
-  void* operator new[](size_t) throw (std::bad_alloc); \
-  void* operator new[](size_t, void*) throw(); \
-  void* operator new[](size_t, const std::nothrow_t&) throw(); \
-  void* operator new(size_t N, std::allocator<Class>&);
-#else
 #define MEMORY_ALLOC_OPERATORS(Class) \
   void* operator new(size_t size){ return ::operator new(size); }  \
   void* operator new(size_t, void*) noexcept; \
@@ -60,20 +50,9 @@ namespace sql
   void* operator new[](size_t, const std::nothrow_t&) noexcept; \
   void* operator new(size_t N, std::allocator<Class>&);
 
-#endif
-#ifdef _WIN32
-#pragma warning (disable : 4290)
-//warning C4290: C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-
 
-#pragma warning(push)
-#pragma warning(disable: 4275)
-#endif
-class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
+class SQLException : public std::runtime_error
 {
-#ifdef _WIN32
-#pragma warning(pop)
-#endif
 protected:
   const std::string sql_state;
   const int errNo;
@@ -109,38 +88,38 @@ class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
     return errNo;
   }
 
-  virtual ~SQLException() throw () {};
+  virtual ~SQLException() noexcept {};
 
 protected:
   MEMORY_ALLOC_OPERATORS(SQLException)
 };
 
-struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
+struct MethodNotImplementedException : public SQLException
 {
   MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
   MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
 };
 
-struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
+struct InvalidArgumentException : public SQLException
 {
   InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
   InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
 };
 
-struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
+struct InvalidInstanceException : public SQLException
 {
   InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
   InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
 };
 
 
-struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
+struct NonScrollableException : public SQLException
 {
   NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
   NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
 };
 
-struct CPPCONN_PUBLIC_FUNC SQLUnsupportedOptionException : public SQLException
+struct SQLUnsupportedOptionException : public SQLException
 {
   SQLUnsupportedOptionException(const SQLUnsupportedOptionException& e, const std::string conn_option) :
     SQLException(e.what(), e.sql_state, e.errNo),
@@ -157,7 +136,7 @@ struct CPPCONN_PUBLIC_FUNC SQLUnsupportedOptionException : public SQLException
     return option.c_str();
   }
 
-  ~SQLUnsupportedOptionException() throw () {};
+  ~SQLUnsupportedOptionException() noexcept {};
 protected:
   const std::string option;
 };

driver/mysql_connection.cpp

@@ -657,10 +657,7 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
         throw sql::InvalidArgumentException("Wrong type passed for port expected int");
       }
       if (p_i) {
-        for(auto &h : uri)
-        {
-          uri.setDefaultPort(*p_i);
-        }
+        uri.setDefaultPort(*p_i);
       } else {
         throw sql::InvalidArgumentException("No long long value passed for port");
       }

driver/mysql_debug.cpp

@@ -91,7 +91,8 @@ MySQL_DebugLogger::MySQL_DebugLogger()
 /* {{{ MySQL_DebugLogger::~MySQL_DebugLogger() -I- */
 MySQL_DebugLogger::~MySQL_DebugLogger()
 {
-  callStack.empty();
+  while(!callStack.empty())
+    callStack.pop();
 }
 /* }}} */
 

examples/examples.h

@@ -78,7 +78,7 @@ struct _test_data {
   int id;
   const char* label;
 };
-static _test_data test_data[EXAMPLE_NUM_TEST_ROWS] = {
+_test_data test_data[EXAMPLE_NUM_TEST_ROWS] = {
   {1, ""}, {2, "a"}, {3, "b"}, {4, "c"},
 };
 

test/framework/test_runner.cpp

@@ -49,7 +49,7 @@ TestsRunner::TestsRunner()
 
 bool TestsRunner::runTests()
 {
-  TestSuiteNames.empty();
+  TestSuiteNames.clear();
 
   TestSuiteFactory::theInstance().getTestsList( TestSuiteNames );