summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qvector.h
diff options
context:
space:
mode:
authorjasplin <qt-info@nokia.com>2009-06-04 10:39:29 +0200
committerjasplin <qt-info@nokia.com>2009-06-04 10:40:43 +0200
commit397c3bb494e220af5ef1cf6e47cfdfc84b61540b (patch)
tree11dd876ffcdb8106517fe90709650d0b24e034d9 /src/corelib/tools/qvector.h
parentd167d50234a977eae5c03cca20a78850437d5b87 (diff)
Fixed build error with Sun CC 5.5.
Reviewed-by: TrustMe
Diffstat (limited to 'src/corelib/tools/qvector.h')
-rw-r--r--src/corelib/tools/qvector.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 7bdcba0e96..38254cdf06 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(); }