Merge branch 'series/1.1' into jdbc

Author: silvakid

driver/mysql_prepared_statement.cpp

@@ -35,11 +35,13 @@
 
 #include <iostream>
 #include <sstream>
+#include "mysql_util.h"
+DIAGNOSTIC_PUSH
+DISABLE_WARNING(-Wparentheses)
 #include <boost/variant.hpp>
 #include <boost/scoped_array.hpp>
-
+DIAGNOSTIC_POP
 #include <cppconn/exception.h>
-#include "mysql_util.h"
 #include "mysql_connection.h"
 #include "mysql_statement.h"
 #include "mysql_prepared_statement.h"

driver/mysql_util.h

@@ -126,6 +126,41 @@
   #define FALLTHROUGH
 #endif
 
+/*
+  Macros used to disable warnings for fragments of code.
+*/
+
+#if defined __GNUC__ || defined __clang__
+
+#define PRAGMA(X) _Pragma(#X)
+#define DISABLE_WARNING(W) PRAGMA(GCC diagnostic ignored #W)
+
+#if defined __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#define DIAGNOSTIC_PUSH PRAGMA(GCC diagnostic push)
+#define DIAGNOSTIC_POP  PRAGMA(GCC diagnostic pop)
+#else
+#define DIAGNOSTIC_PUSH
+#define DIAGNOSTIC_POP
+#endif
+
+#elif defined _MSC_VER
+
+
+#define PRAGMA(X) __pragma(X)
+#define DISABLE_WARNING(W) PRAGMA(warning (disable:W))
+
+#define DIAGNOSTIC_PUSH  PRAGMA(warning (push))
+#define DIAGNOSTIC_POP   PRAGMA(warning (pop))
+
+#else
+
+#define PRAGMA(X)
+#define DISABLE_WARNING(W)
+
+#define DIAGNOSTIC_PUSH
+#define DIAGNOSTIC_POP
+
+#endif
 
 namespace sql
 {