diff options
| author | jasplin <qt-info@nokia.com> | 2009-06-04 08:39:29 (GMT) |
|---|---|---|
| committer | jasplin <qt-info@nokia.com> | 2009-06-04 08:40:43 (GMT) |
| commit | 397c3bb494e220af5ef1cf6e47cfdfc84b61540b (patch) | |
| tree | 11dd876ffcdb8106517fe90709650d0b24e034d9 | |
| parent | d167d50234a977eae5c03cca20a78850437d5b87 (diff) | |
| download | Qt-397c3bb494e220af5ef1cf6e47cfdfc84b61540b.zip Qt-397c3bb494e220af5ef1cf6e47cfdfc84b61540b.tar.gz Qt-397c3bb494e220af5ef1cf6e47cfdfc84b61540b.tar.bz2 | |
Fixed build error with Sun CC 5.5.
Reviewed-by: TrustMe
| -rw-r--r-- | src/corelib/tools/qvector.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 7bdcba0..38254cd 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -94,7 +94,14 @@ template <typename T> class QVector { typedef QVectorTypedData<T> Data; - union { QVectorData *d; Data *p; }; + union { + QVectorData *d; +#if defined(Q_CC_SUN) && (__SUNPRO_CC <= 0x550) + QVectorTypedData<T> *p; +#else + Data *p; +#endif + }; public: inline QVector() : d(&QVectorData::shared_null) { d->ref.ref(); } |