summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2018-06-15 12:11:11 +0200
committerAndy Shaw <andy.shaw@qt.io>2018-06-15 11:32:13 +0000
commitcd02eb5b2090a8e263642ce900de9160e60f7d0f (patch)
treea5bbeffb62234ddb683766d17b87579784612781
parentd4a5ea2d4a367d01990dd3bd01631d2769d844f0 (diff)
ibase: Silence warning about incompatible function types
This correctly silents the warning about incompatible function types, it amends the previous fix - 6108d8f515d7911427b764647f1d6ab487ad5203 Task-number: QTBUG-68330 Change-Id: I9eda42817740f491b16ac19c553f35fb1c7aa755 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
-rw-r--r--src/plugins/sqldrivers/ibase/qsql_ibase.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index 484dad6e1d..ead08dbce8 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -1845,9 +1845,11 @@ bool QIBaseDriver::subscribeToNotification(const QString &name)
eBuffer->bufferLength,
eBuffer->eventBuffer,
#if defined (FB_API_VER) && FB_API_VER >= 20
- reinterpret_cast<ISC_EVENT_CALLBACK>(qEventCallback),
+ reinterpret_cast<ISC_EVENT_CALLBACK>(reinterpret_cast<void *>
+ (&qEventCallback)),
#else
- reinterpret_cast<isc_callback>(qEventCallback),
+ reinterpret_cast<isc_callback>(reinterpret_cast<void *>
+ (&qEventCallback)),
#endif
eBuffer->resultBuffer);
@@ -1925,9 +1927,11 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer)
eBuffer->bufferLength,
eBuffer->eventBuffer,
#if defined (FB_API_VER) && FB_API_VER >= 20
- reinterpret_cast<ISC_EVENT_CALLBACK>(qEventCallback),
+ reinterpret_cast<ISC_EVENT_CALLBACK>(reinterpret_cast<void *>
+ (&qEventCallback)),
#else
- reinterpret_cast<isc_callback>(qEventCallback),
+ reinterpret_cast<isc_callback>(reinterpret_cast<void *>
+ (&qEventCallback)),
#endif
eBuffer->resultBuffer);
if (Q_UNLIKELY(status[0] == 1 && status[1])) {