Merge branch 'series/1.1' into jdbc

Author: silvakid

driver/mysql_prepared_statement.cpp

@@ -36,11 +36,13 @@
 #include <iostream>
 #include <sstream>
 #include "mysql_util.h"
-#if defined __GNUC__ && __GNUC__ >= 8
+#if (defined __GNUC__) && (__GNUC__ >= 8)
 DIAGNOSTIC_PUSH
 DISABLE_WARNING(-Wparentheses)
+#endif
 #include <boost/variant.hpp>
 #include <boost/scoped_array.hpp>
+#if (defined __GNUC__) && (__GNUC__ >= 8)
 DIAGNOSTIC_POP
 #endif
 #include <cppconn/exception.h>