From f7e837ae1534b519bbe604fbb1eef22c35d37de1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 19:38:19 +0200 Subject: Sun CC 5.9 still doesn't support Template-Template Parameters I had added the version check when we only had CC 5.5 and 5.6, expecting that 5.7 would have the support. And if it didn't, then someone would notice the compile error in QtConcurrent, bumping the version number here. Except that QtConcurrent was never enabled with Sun CC. Which meant that we never got to test TTP support. Reviewed-By: Bradley T. Hughes --- src/corelib/global/qglobal.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 461bd36..3625f2b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -653,9 +653,7 @@ 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 -# if __SUNPRO_CC < 0x570 -# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS -# endif +# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS /* see http://developers.sun.com/sunstudio/support/Ccompare.html */ # if __SUNPRO_CC >= 0x590 # define Q_ALIGNOF(type) __alignof__(type) -- cgit v0.12