Skip to content

Commit 19c30e5

Browse files
committed
Fixed NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE
1 parent 0d5ede1 commit 19c30e5

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

include/nbl/builtin/hlsl/concepts.hlsl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ concept NBL_CONCEPT_NAME = requires BOOST_PP_EXPR_IF(LOCAL_PARAM_COUNT,(BOOST_PP
6868
//
6969
#define NBL_IMPL_CONCEPT_REQ_TYPE(...) typename __VA_ARGS__;
7070
#define NBL_IMPL_CONCEPT_REQ_EXPR(...) __VA_ARGS__;
71-
#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) {E}; C<decltype E,__VA_ARGS__ >;
71+
#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) {E}; C<decltype E __VA_OPT__(,) __VA_ARGS__ >;
7272
//
7373
#define NBL_IMPL_CONCEPT (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
7474
//
@@ -118,9 +118,6 @@ concept any_of = (same_as<T, Ts> || ...);
118118
template <typename T>
119119
concept scalar = floating_point<T> || integral<T>;
120120

121-
template <typename T>
122-
concept vectorial = is_vector<T>::value;
123-
124121
template <typename T>
125122
concept matricial = is_matrix<T>::value;
126123

@@ -153,7 +150,7 @@ concept matricial = is_matrix<T>::value;
153150
//
154151
#define NBL_IMPL_CONCEPT_REQ_TYPE(...) ::nbl::hlsl::make_void_t<typename __VA_ARGS__ >
155152
#define NBL_IMPL_CONCEPT_REQ_EXPR(...) ::nbl::hlsl::make_void_t<decltype(__VA_ARGS__)>
156-
#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) ::nbl::hlsl::enable_if_t<C<decltype E ,__VA_ARGS__ > >
153+
#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) ::nbl::hlsl::enable_if_t<C<decltype E __VA_OPT__(,) __VA_ARGS__ > >
157154
//
158155
#define NBL_IMPL_CONCEPT_SFINAE (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
159156
//

0 commit comments

Comments
 (0)