diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-30 13:33:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-30 17:21:50 +0200 |
| commit | 587d832f715771b80e31f35372efc60f09316d55 (patch) | |
| tree | f1acfe3d7c1534d321418f94694f470d8f4b4479 | |
| parent | 8530095108df75256c5fe26cb7ddaa25368b4d1a (diff) | |
| download | qt4-tools-587d832f715771b80e31f35372efc60f09316d55.tar.gz | |
Sun CC 5.10 supports Template-Template Parameters
See http://www.oracle.com/technetwork/systems/cccompare-137792.html
Task-number: QTBUG-18879
Change-Id: Icb08771527a718c1ce4f0919116c3834cf979be4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 | ||||
| -rw-r--r-- | tests/auto/collections/tst_collections.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 15912a4031..d4bfd2b018 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -718,8 +718,10 @@ namespace QT_NAMESPACE {} in which case _BOOL is not defined this is the default in 4.2 compatibility mode triggered by -compat=4 */ # if __SUNPRO_CC >= 0x500 -# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS - /* see http://developers.sun.com/sunstudio/support/Ccompare.html */ +# if __SUNPRO_CC < 0x590 +# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS + /* see http://www.oracle.com/technetwork/systems/cccompare-137792.html */ +# endif # if __SUNPRO_CC >= 0x590 # define Q_ALIGNOF(type) __alignof__(type) # define Q_TYPEOF(expr) __typeof__(expr) diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp index fff0409cca..7045df7cab 100644 --- a/tests/auto/collections/tst_collections.cpp +++ b/tests/auto/collections/tst_collections.cpp @@ -3698,6 +3698,8 @@ void tst_Collections::QTBUG13079_collectionInsideCollection() QTBUG13079_collectionInsidePtrImpl<QSharedPointer>(); QTBUG13079_collectionInsidePtrImpl<QExplicitlySharedDataPointer>(); QTBUG13079_collectionInsidePtrImpl<QSharedDataPointer>(); +#else + QSKIP("Template-Template Parameters are not supported", SkipAll); #endif } |