|
115 | 115 | #if QT_VERSION >= 0x060700 |
116 | 116 | // override Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE et al to return something the parser understands: |
117 | 117 | #include <QtCore/qcomparehelpers.h> |
118 | | -#define Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE) \ |
| 118 | +#define Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE, ...) \ |
119 | 119 | friend bool operator==(const TYPE& lhs, const TYPE& rhs); \ |
120 | 120 | friend bool operator!=(const TYPE& lhs, const TYPE& rhs); \ |
121 | 121 | friend bool operator< (const TYPE& lhs, const TYPE& rhs); \ |
|
126 | 126 | #define Q_DECLARE_WEAKLY_ORDERED_LITERAL_TYPE(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE) |
127 | 127 | #define Q_DECLARE_PARTIALLY_ORDERED_LITERAL_TYPE(TYPE) Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE) |
128 | 128 |
|
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) |
131 | 131 | #define Q_DECLARE_PARTIALLY_ORDERED Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(TYPE) |
132 | 132 |
|
133 | | -#define Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE) \ |
| 133 | +#define Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(TYPE, ...) \ |
134 | 134 | public: \ |
135 | 135 | bool operator==(const TYPE& rhs) const; \ |
136 | 136 | bool operator!=(const TYPE& rhs) const; \ |
137 | 137 | private: |
138 | 138 |
|
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) |
140 | 140 |
|
141 | 141 | #endif |
142 | 142 |
|
|
0 commit comments