Skip to content

Commit 788ae94

Browse files
committed
Runner-up: Used conservative type trait value syntax again
1 parent 6c70086 commit 788ae94

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

dev/alias_traits.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace sqlite_orm {
2727
*/
2828
template<class A>
2929
SQLITE_ORM_INLINE_VAR constexpr bool is_column_alias_v =
30-
polyfill::conjunction_v<is_alias<A>, polyfill::negation<polyfill::is_detected<type_t, A>>>;
30+
polyfill::conjunction<is_alias<A>, polyfill::negation<polyfill::is_detected<type_t, A>>>::value;
3131

3232
template<class A>
3333
struct is_column_alias : is_alias<A> {};
@@ -36,7 +36,7 @@ namespace sqlite_orm {
3636
*/
3737
template<class A>
3838
SQLITE_ORM_INLINE_VAR constexpr bool is_recordset_alias_v =
39-
polyfill::conjunction_v<is_alias<A>, polyfill::is_detected<type_t, A>>;
39+
polyfill::conjunction<is_alias<A>, polyfill::is_detected<type_t, A>>::value;
4040

4141
template<class A>
4242
struct is_recordset_alias : polyfill::bool_constant<is_recordset_alias_v<A>> {};

dev/conditions.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,9 @@ namespace sqlite_orm {
563563

564564
template<class T>
565565
SQLITE_ORM_INLINE_VAR constexpr bool is_order_by_v =
566-
polyfill::disjunction_v<polyfill::is_specialization_of<T, order_by_t>,
567-
polyfill::is_specialization_of<T, multi_order_by_t>,
568-
polyfill::is_specialization_of<T, dynamic_order_by_t>>;
566+
polyfill::disjunction<polyfill::is_specialization_of<T, order_by_t>,
567+
polyfill::is_specialization_of<T, multi_order_by_t>,
568+
polyfill::is_specialization_of<T, dynamic_order_by_t>>::value;
569569

570570
template<class T>
571571
struct is_order_by : polyfill::bool_constant<is_order_by_v<T>> {};

include/sqlite_orm/sqlite_orm.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3232,7 +3232,7 @@ namespace sqlite_orm {
32323232
*/
32333233
template<class A>
32343234
SQLITE_ORM_INLINE_VAR constexpr bool is_column_alias_v =
3235-
polyfill::conjunction_v<is_alias<A>, polyfill::negation<polyfill::is_detected<type_t, A>>>;
3235+
polyfill::conjunction<is_alias<A>, polyfill::negation<polyfill::is_detected<type_t, A>>>::value;
32363236

32373237
template<class A>
32383238
struct is_column_alias : is_alias<A> {};
@@ -3241,7 +3241,7 @@ namespace sqlite_orm {
32413241
*/
32423242
template<class A>
32433243
SQLITE_ORM_INLINE_VAR constexpr bool is_recordset_alias_v =
3244-
polyfill::conjunction_v<is_alias<A>, polyfill::is_detected<type_t, A>>;
3244+
polyfill::conjunction<is_alias<A>, polyfill::is_detected<type_t, A>>::value;
32453245

32463246
template<class A>
32473247
struct is_recordset_alias : polyfill::bool_constant<is_recordset_alias_v<A>> {};
@@ -4076,9 +4076,9 @@ namespace sqlite_orm {
40764076

40774077
template<class T>
40784078
SQLITE_ORM_INLINE_VAR constexpr bool is_order_by_v =
4079-
polyfill::disjunction_v<polyfill::is_specialization_of<T, order_by_t>,
4080-
polyfill::is_specialization_of<T, multi_order_by_t>,
4081-
polyfill::is_specialization_of<T, dynamic_order_by_t>>;
4079+
polyfill::disjunction<polyfill::is_specialization_of<T, order_by_t>,
4080+
polyfill::is_specialization_of<T, multi_order_by_t>,
4081+
polyfill::is_specialization_of<T, dynamic_order_by_t>>::value;
40824082

40834083
template<class T>
40844084
struct is_order_by : polyfill::bool_constant<is_order_by_v<T>> {};

0 commit comments

Comments
 (0)