diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-06-15 12:11:11 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-11-19 15:42:13 +0000 |
| commit | 8b9a771ec0b70822f4a34d289459d3e60b9510ce (patch) | |
| tree | e809c24197993cb7747bfb823062335de251ed60 | |
| parent | 5f72767f9963ab17ee16b611c8ee9a40ea04b941 (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>
(cherry picked from commit cd02eb5b2090a8e263642ce900de9160e60f7d0f)
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -rw-r--r-- | src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 12 |
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 2b75f3c964..f418bc30b4 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -1840,9 +1840,11 @@ bool QIBaseDriver::subscribeToNotification(const QString &name) eBuffer->bufferLength, eBuffer->eventBuffer, #if defined (FB_API_VER) && FB_API_VER >= 20 - (ISC_EVENT_CALLBACK)qEventCallback, + reinterpret_cast<ISC_EVENT_CALLBACK>(reinterpret_cast<void *> + (&qEventCallback)), #else - (isc_callback)qEventCallback, + reinterpret_cast<isc_callback>(reinterpret_cast<void *> + (&qEventCallback)), #endif eBuffer->resultBuffer); @@ -1920,9 +1922,11 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer) eBuffer->bufferLength, eBuffer->eventBuffer, #if defined (FB_API_VER) && FB_API_VER >= 20 - (ISC_EVENT_CALLBACK)qEventCallback, + reinterpret_cast<ISC_EVENT_CALLBACK>(reinterpret_cast<void *> + (&qEventCallback)), #else - (isc_callback)qEventCallback, + reinterpret_cast<isc_callback>(reinterpret_cast<void *> + (&qEventCallback)), #endif eBuffer->resultBuffer); if (Q_UNLIKELY(status[0] == 1 && status[1])) { |