diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-11-10 03:01:07 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-11-10 03:01:07 (GMT) |
| commit | 8df98549a4d84b5877e50318140c2041e17632fb (patch) | |
| tree | 0c55d5ef4d8380ec45c6457a40b033dc45cbd579 /src/corelib/tools/qvector.h | |
| parent | f55c317e377aaf0b3e24904e88dc1c4a6e15a20a (diff) | |
| parent | 9a6de1fa0db0da8c4fa5eb904ef6d78cc619e332 (diff) | |
| download | Qt-8df98549a4d84b5877e50318140c2041e17632fb.zip Qt-8df98549a4d84b5877e50318140c2041e17632fb.tar.gz Qt-8df98549a4d84b5877e50318140c2041e17632fb.tar.bz2 | |
Merge branch '4.6' of ../qt into 4.6
Diffstat (limited to 'src/corelib/tools/qvector.h')
| -rw-r--r-- | src/corelib/tools/qvector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 7402d77..930b006 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -92,7 +92,7 @@ struct QVectorTypedData : private QVectorData // as this would break strict aliasing rules. (in the case of shared_null) T array[1]; - static inline void free(QVectorTypedData *x, int alignment) { QVectorData::free(x, alignment); } + static inline void free(QVectorTypedData<T> *x, int alignment) { QVectorData::free(static_cast<QVectorData *>(x), alignment); } }; class QRegion; |