Skip to content

Commit f87ca86

Browse files
committed
Allow more parameters in macros
1 parent 7ee7c45 commit f87ca86

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

generator/qtscript_masterinclude.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
#if QT_VERSION >= 0x060700
116116
// override Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE et al to return something the parser understands:
117117
#include <QtCore/qcomparehelpers.h>
118-
#define Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE) \
118+
#define Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE, ...) \
119119
friend bool operator==(const TYPE& lhs, const TYPE& rhs); \
120120
friend bool operator!=(const TYPE& lhs, const TYPE& rhs); \
121121
friend bool operator< (const TYPE& lhs, const TYPE& rhs); \
@@ -126,17 +126,17 @@
126126
#define Q_DECLARE_WEAKLY_ORDERED_LITERAL_TYPE(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
127127
#define Q_DECLARE_PARTIALLY_ORDERED_LITERAL_TYPE(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
128128

129-
#define Q_DECLARE_STRONGLY_ORDERED(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
130-
#define Q_DECLARE_WEAKLY_ORDERED(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
129+
#define Q_DECLARE_STRONGLY_ORDERED(TYPE, ...) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
130+
#define Q_DECLARE_WEAKLY_ORDERED(TYPE, ...) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
131131
#define Q_DECLARE_PARTIALLY_ORDERED Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE)
132132

133-
#define Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE) \
133+
#define Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE, ...) \
134134
public: \
135135
bool operator==(const TYPE& rhs) const; \
136136
bool operator!=(const TYPE& rhs) const; \
137137
private:
138138

139-
#define Q_DECLARE_EQUALITY_COMPARABLE(TYPE) Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE)
139+
#define Q_DECLARE_EQUALITY_COMPARABLE(TYPE, ...) Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE)
140140

141141
#endif
142142

0 commit comments

Comments
 (0)