1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC warning about casting to pointer of different size

Browse Source 
qdatetime.cpp(2834): warning C4312: 'reinterpret_cast': conversion from 'int' to 'QDateTimePrivate *' of greater size

Change-Id: Ib57b52598e2f452985e9fffd1458fe3ba3fcfb48
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Thiago Macieira 2016-06-17 15:06:50 -07:00
parent 221b123e5d
commit a2f319e9fb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qdatetime.cpp
View File

@ -2737,7 +2737,7 @@ static QPair<QDate, QTime> getDateTime(const QDateTimeData &d)
inline QDateTime::Data::Data(Qt::TimeSpec spec) inline QDateTime::Data::Data(Qt::TimeSpec spec)
{ {
if (CanBeSmall && Q_LIKELY(specCanBeSmall(spec))) { if (CanBeSmall && Q_LIKELY(specCanBeSmall(spec))) {
d = reinterpret_cast<QDateTimePrivate *>(int(mergeSpec(QDateTimePrivate::ShortData, spec))); d = reinterpret_cast<QDateTimePrivate *>(quintptr(mergeSpec(QDateTimePrivate::ShortData, spec)));
} else { } else {
// the structure is too small, we need to detach // the structure is too small, we need to detach
d = new QDateTimePrivate; d = new QDateTimePrivate;