AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ibase: Silence warning about incompatible function types

Browse Source 
This correctly silents the warning about incompatible function types,
it amends the previous fix - 6108d8f515

Task-number: QTBUG-68330
Change-Id: I9eda42817740f491b16ac19c553f35fb1c7aa755
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Andy Shaw 2018-06-15 12:11:11 +02:00
parent d4a5ea2d4a
commit cd02eb5b20
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/sqldrivers/ibase/qsql_ibase.cpp
View File

@ -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])) {