diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-21 10:24:42 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-21 10:43:27 (GMT) |
| commit | 573235120825c6d95c73adf374fde6ed4f38cafa (patch) | |
| tree | 12aa399c572fb8177dcf422080299c686f0e85d4 | |
| parent | d159db5214b6bd489d4a1e16d6b8077eb242e6da (diff) | |
| download | Qt-573235120825c6d95c73adf374fde6ed4f38cafa.zip Qt-573235120825c6d95c73adf374fde6ed4f38cafa.tar.gz Qt-573235120825c6d95c73adf374fde6ed4f38cafa.tar.bz2 | |
sunpro doesn't like templated friend classes, either
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 2 | ||||
| -rw-r--r-- | tools/linguist/shared/profileevaluator.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 9a27eb0..5a9095a 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -256,7 +256,7 @@ public: ProFile *m_prevProFile; // See m_prevLineNo }; -#if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) +#if (!defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)) && !defined(__SUNPRO_CC) Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::State, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::ProLoop, Q_MOVABLE_TYPE); #endif diff --git a/tools/linguist/shared/profileevaluator.h b/tools/linguist/shared/profileevaluator.h index 88b7590..f3498c1 100644 --- a/tools/linguist/shared/profileevaluator.h +++ b/tools/linguist/shared/profileevaluator.h @@ -96,7 +96,7 @@ private: class Private; Private *d; - // This doesn't help gcc 3.3 ... + // This doesn't help gcc 3.3 and sunpro ... template<typename T> friend class QTypeInfo; }; |