From 572d13eeaaa7aea7aa09d6c5de420338f742ea4b Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Wed, 9 Jun 2010 16:55:59 +0200
Subject: Fix warning with gcc in -pedantic

Empty marcro arguments throws warning on some compilers.

(Correction of 89dfa8d7a46c992b066e5335d64089bf796e2f83)

Reviewed-by: Thiago
Task-number: QTBUG-11334
---
 src/corelib/global/qglobal.h            | 6 +++---
 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 28ac377..6bcc95b 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 9e40bd5..2329470 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
-- 
cgit v0.12