Skip to content

Commit 22e78eb

Browse files
author
kevyuu
committed
Fix concatenation of 'operator' and OP with '##' since operatorOP is not a single token
1 parent 42baa6c commit 22e78eb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

include/nbl/builtin/hlsl/emulated/vector_t.hlsl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,25 @@ struct emulated_vector;
133133
// Generic ComponentType vectors still have to be partial specialized based on whether they're fundamental and/or integral
134134

135135
#define NBL_EMULATED_VECTOR_UNARY_OPERATOR(OP)\
136-
NBL_CONSTEXPR_FUNC this_t operator##OP() NBL_CONST_MEMBER_FUNC \
136+
NBL_CONSTEXPR_FUNC this_t operator OP() NBL_CONST_MEMBER_FUNC \
137137
{\
138138
this_t output;\
139139
[[unroll]]\
140140
for (uint32_t i = 0u; i < CRTP::Dimension; ++i)\
141-
output.setComponent(i, this_t::getComponent(i).operator##OP());\
141+
output.setComponent(i, this_t::getComponent(i).operator OP());\
142142
return output;\
143143
}
144144

145145
#define NBL_EMULATED_VECTOR_ARITHMETIC_OPERATOR(OP)\
146-
NBL_CONSTEXPR_FUNC this_t operator##OP (component_t val) NBL_CONST_MEMBER_FUNC \
146+
NBL_CONSTEXPR_FUNC this_t operator OP (component_t val) NBL_CONST_MEMBER_FUNC \
147147
{\
148148
this_t output;\
149149
[[unroll]]\
150150
for (uint32_t i = 0u; i < CRTP::Dimension; ++i)\
151151
output.setComponent(i, this_t::getComponent(i) OP val);\
152152
return output;\
153153
}\
154-
NBL_CONSTEXPR_FUNC this_t operator##OP (this_t other) NBL_CONST_MEMBER_FUNC \
154+
NBL_CONSTEXPR_FUNC this_t operator OP (this_t other) NBL_CONST_MEMBER_FUNC \
155155
{\
156156
this_t output;\
157157
[[unroll]]\
@@ -161,7 +161,7 @@ NBL_CONSTEXPR_FUNC this_t operator##OP (this_t other) NBL_CONST_MEMBER_FUNC \
161161
}
162162

163163
#define NBL_EMULATED_FUNDAMENTAL_TYPE_VECTOR_ARITHMETIC_OPERATOR(OP) NBL_EMULATED_VECTOR_ARITHMETIC_OPERATOR(OP)\
164-
NBL_CONSTEXPR_FUNC this_t operator##OP(vector<component_t, CRTP::Dimension> other) NBL_CONST_MEMBER_FUNC \
164+
NBL_CONSTEXPR_FUNC this_t operator OP(vector<component_t, CRTP::Dimension> other) NBL_CONST_MEMBER_FUNC \
165165
{\
166166
this_t output;\
167167
[[unroll]]\
@@ -170,7 +170,7 @@ NBL_CONSTEXPR_FUNC this_t operator##OP(vector<component_t, CRTP::Dimension> othe
170170
return output;\
171171
}
172172

173-
#define NBL_EMULATED_VECTOR_COMPARISON_OPERATOR(OP) NBL_CONSTEXPR_FUNC vector<bool, CRTP::Dimension> operator##OP (this_t other) NBL_CONST_MEMBER_FUNC \
173+
#define NBL_EMULATED_VECTOR_COMPARISON_OPERATOR(OP) NBL_CONSTEXPR_FUNC vector<bool, CRTP::Dimension> operator OP (this_t other) NBL_CONST_MEMBER_FUNC \
174174
{\
175175
vector<bool, CRTP::Dimension> output;\
176176
[[unroll]]\
@@ -180,7 +180,7 @@ NBL_CONSTEXPR_FUNC this_t operator##OP(vector<component_t, CRTP::Dimension> othe
180180
}
181181

182182
#define NBL_EMULATED_FUNDAMENTAL_TYPE_VECTOR_COMPARISON_OPERATOR(OP) NBL_EMULATED_VECTOR_COMPARISON_OPERATOR(OP)\
183-
NBL_CONSTEXPR_FUNC vector<bool, CRTP::Dimension> operator##OP (vector<component_t, CRTP::Dimension> other) NBL_CONST_MEMBER_FUNC \
183+
NBL_CONSTEXPR_FUNC vector<bool, CRTP::Dimension> operator OP (vector<component_t, CRTP::Dimension> other) NBL_CONST_MEMBER_FUNC \
184184
{\
185185
vector<bool, CRTP::Dimension> output;\
186186
[[unroll]]\

0 commit comments

Comments
 (0)