diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-09 16:55:59 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-11 10:32:42 +0200 |
| commit | 572d13eeaaa7aea7aa09d6c5de420338f742ea4b (patch) | |
| tree | 64f55582b3c7d954f3b1d4bd2e564857ef318c56 | |
| parent | 03fc216b42fbbd75b3796846386a8e8399ce62ba (diff) | |
| download | qt4-tools-572d13eeaaa7aea7aa09d6c5de420338f742ea4b.tar.gz | |
Fix warning with gcc in -pedantic
Empty marcro arguments throws warning on some compilers.
(Correction of 89dfa8d7a46c992b066e5335d64089bf796e2f83)
Reviewed-by: Thiago
Task-number: QTBUG-11334
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 28ac377f3f..6bcc95b06b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2041,8 +2041,7 @@ enum { /* TYPEINFO flags */ Q_DUMMY_TYPE = 0x4 }; -#define Q_DECLARE_TYPEINFO_TEMPLATE(TYPE, FLAGS, TEMPLATE_ARG) \ -template <TEMPLATE_ARG> \ +#define Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS) \ class QTypeInfo<TYPE > \ { \ public: \ @@ -2057,7 +2056,8 @@ public: \ } #define Q_DECLARE_TYPEINFO(TYPE, FLAGS) \ -Q_DECLARE_TYPEINFO_TEMPLATE(TYPE, FLAGS, ) +template<> \ +Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS) template <typename T> diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 9e40bd52dd..2329470ae7 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -844,8 +844,8 @@ qobject_cast(const QWeakPointer<T> &src) #endif -Q_DECLARE_TYPEINFO_TEMPLATE(QWeakPointer<T>, Q_MOVABLE_TYPE, typename T); -Q_DECLARE_TYPEINFO_TEMPLATE(QSharedPointer<T>, Q_MOVABLE_TYPE, typename T); +template<typename T> Q_DECLARE_TYPEINFO_BODY(QWeakPointer<T>, Q_MOVABLE_TYPE); +template<typename T> Q_DECLARE_TYPEINFO_BODY(QSharedPointer<T>, Q_MOVABLE_TYPE); QT_END_NAMESPACE |