@@ -890,13 +890,13 @@ concept NullableSharedPtr = OnlyNoneModifiers<Other...> && ObjectBaseType<Type>;
890
890
891
891
// Test if this method should std::static_pointer_cast an ObjectDerivedType to
892
892
// std::shared_ptr<const Object>.
893
- template <typename Type, TypeModifier Modifier, TypeModifier... Other >
894
- concept NoneObjectDerivedType = OnlyNoneModifiers<Modifier, Other... > && ObjectDerivedType<Type>;
893
+ template <typename Type, TypeModifier Modifier>
894
+ concept NoneObjectDerivedType = OnlyNoneModifiers<Modifier> && ObjectDerivedType<Type>;
895
895
896
896
// Test all other result types to see if they should call the specialized convert method without
897
897
// template parameters.
898
- template <typename Type, TypeModifier Modifier, TypeModifier... Other >
899
- concept NoneScalarOrObjectType = OnlyNoneModifiers<Modifier, Other... > && !ObjectDerivedType<Type>;
898
+ template <typename Type, TypeModifier Modifier>
899
+ concept NoneScalarOrObjectType = OnlyNoneModifiers<Modifier> && !ObjectDerivedType<Type>;
900
900
901
901
// Test if this method should return a nullable std::shared_ptr<Type>
902
902
template <typename Type, TypeModifier Modifier, TypeModifier... Other>
@@ -945,7 +945,7 @@ struct ModifiedResult
945
945
template <TypeModifier Modifier = TypeModifier::None, TypeModifier... Other>
946
946
[[nodiscard]] static inline AwaitableResolver convert (
947
947
AwaitableObject<typename ResultTraits<Type>::type> result,
948
- ResolverParams params) requires NoneObjectDerivedType<Type, Modifier, Other... >
948
+ ResolverParams params) requires NoneObjectDerivedType<Type, Modifier>
949
949
{
950
950
// Call through to the Object specialization with a static_pointer_cast for subclasses of
951
951
// Object.
@@ -966,7 +966,7 @@ struct ModifiedResult
966
966
template <TypeModifier Modifier = TypeModifier::None, TypeModifier... Other>
967
967
[[nodiscard]] static inline AwaitableResolver convert (
968
968
typename ResultTraits<Type>::future_type result,
969
- ResolverParams params) requires NoneScalarOrObjectType<Type, Modifier, Other... >
969
+ ResolverParams params) requires NoneScalarOrObjectType<Type, Modifier>
970
970
{
971
971
static_assert (sizeof ...(Other) == 0 , " None modifier should always be last" );
972
972
0 commit comments