Skip to content

Commit 6a782ff

Browse files
committed
Merge branch 'series/1.1' into jdbc
2 parents 195935b + a576f72 commit 6a782ff

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

driver/mysql_prepared_statement.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@
3636
#include <iostream>
3737
#include <sstream>
3838
#include "mysql_util.h"
39+
#if defined __GNUC__ && __GNUC__ >= 8
3940
DIAGNOSTIC_PUSH
4041
DISABLE_WARNING(-Wparentheses)
4142
#include <boost/variant.hpp>
4243
#include <boost/scoped_array.hpp>
4344
DIAGNOSTIC_POP
45+
#endif
4446
#include <cppconn/exception.h>
4547
#include "mysql_connection.h"
4648
#include "mysql_statement.h"

0 commit comments

Comments
 (0)