projects/aports·blob master · refs

32 lines · 862 B

1Fix NULL returns from my_bool callbacks.
2musl defines NULL as nullptr in C++11+, which cannot be converted to
3the integral my_bool type. Return 0 explicitly from these callbacks.
4--- a/driver/cppmini/class/ServerSidePreparedStatement.cpp
5+++ b/driver/cppmini/class/ServerSidePreparedStatement.cpp
6@@ -334,7 +334,7 @@
7 {
8 // Assuming paramset skip is set in the indicator of 1st column
9 if (bind->u.indicator && *bind->u.indicator == STMT_INDICATOR_IGNORE_ROW) {
10- return NULL;
11+ return 0;
12 }
13 // We can't let the callback to throw - we have to intercept, as otherwise we are guaranteed to have
14 // the protocol broken
15@@ -366,7 +366,7 @@
16 {
17 return (my_bool)error;
18 }
19- return NULL;
20+ return 0;
21 }
22
23
24@@ -388,7 +388,7 @@
25 {
26 return (my_bool)error;
27 }
28- return NULL;
29+ return 0;
30 }
31
32