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

Get rid of MSVC compiler warnings from QVector code

Browse Source 
Change-Id: I39b849721f3ba790c4a9197d69ac48e98cc2f5bd
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-05-31 16:48:22 +02:00 committed by Qt by Nokia
parent 7b737b172d
commit cd91f1cc10
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/tools/qvector.h
View File

@ -298,6 +298,10 @@ private:
class AlignmentDummy { Data header; T array[1]; };
};
#ifdef Q_CC_MSVC
# pragma warning ( disable : 4345 ) // behavior change: an object of POD type constructed with an initializer of the form () will be default-initialized
#endif
template <typename T>
void QVector<T>::defaultConstruct(T *from, T *to)
{
@ -310,6 +314,10 @@ void QVector<T>::defaultConstruct(T *from, T *to)
}
}
#ifdef Q_CC_MSVC
# pragma warning ( default: 4345 )
#endif
template <typename T>
void QVector<T>::copyConstruct(T *srcFrom, T *srcTo, T *dstFrom)
{
@ -569,10 +577,10 @@ void QVector<T>::realloc(const int asize, const int aalloc, QArrayData::Allocati
}
Q_ASSERT(d->data());
Q_ASSERT(d->size <= d->alloc);
Q_ASSERT(uint(d->size) <= d->alloc);
Q_ASSERT(d != Data::unsharableEmpty());
Q_ASSERT(aalloc ? d != Data::sharedNull() : d == Data::sharedNull());
Q_ASSERT(d->alloc >= aalloc);
Q_ASSERT(d->alloc >= uint(aalloc));
Q_ASSERT(d->size == asize);
}