@@ -41,33 +41,33 @@ namespace traits {
4141
4242// Helper to detect if the strong typedef mapping is explicitly defined,
4343// e.g. TimePointTz
44- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
44+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
4545inline constexpr bool kIsStrongTypedefDirectlyMapped =
4646 // NOLINTNEXTLINE(google-readability-casting)
47- kIsMappedToUserType <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >> ||
47+ kIsMappedToUserType <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>> ||
4848 // NOLINTNEXTLINE(google-readability-casting)
49- kIsMappedToSystemType <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >> ||
49+ kIsMappedToSystemType <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>> ||
5050 // NOLINTNEXTLINE(google-readability-casting)
51- kIsMappedToArray <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >>;
51+ kIsMappedToArray <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>>;
5252
53- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
54- struct IsMappedToPg <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >>
53+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
54+ struct IsMappedToPg <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>>
5555 // NOLINTNEXTLINE(google-readability-casting)
56- : BoolConstant<kIsStrongTypedefDirectlyMapped <Tag, T, Ops, Enable > || kIsMappedToPg <T>> {};
56+ : BoolConstant<kIsStrongTypedefDirectlyMapped <Tag, T, Ops> || kIsMappedToPg <T>> {};
5757
5858// Mark that strong typedef mapping is a special case for disambiguating
5959// specialization of CppToPg
60- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
61- struct IsSpecialMapping <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >>
60+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
61+ struct IsSpecialMapping <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>>
6262 // NOLINTNEXTLINE(google-readability-casting)
63- : BoolConstant<!kIsStrongTypedefDirectlyMapped <Tag, T, Ops, Enable > && kIsMappedToPg <T>> {};
63+ : BoolConstant<!kIsStrongTypedefDirectlyMapped <Tag, T, Ops> && kIsMappedToPg <T>> {};
6464
65- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
66- struct IsNullable <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >> : IsNullable<T> {};
65+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
66+ struct IsNullable <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>> : IsNullable<T> {};
6767
68- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
69- struct GetSetNull <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >> {
70- using ValueType = USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >;
68+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
69+ struct GetSetNull <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>> {
70+ using ValueType = USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>;
7171 using UnderlyingGetSet = GetSetNull<T>;
7272 inline static bool IsNull (const ValueType& v) { return UnderlyingGetSet::IsNull (v.GetUnderlying ()); }
7373 inline static void SetNull (ValueType& v) { UnderlyingGetSet::SetNull (v.GetUnderlying ()); }
@@ -108,10 +108,10 @@ using EnableIfCanUseEnumAsStrongTypedef = std::enable_if_t<impl::CheckCanUseEnum
108108
109109} // namespace traits
110110
111- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
112- struct BufferFormatter <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >>
113- : detail::BufferFormatterBase<USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >> {
114- using BaseType = detail::BufferFormatterBase<USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >>;
111+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
112+ struct BufferFormatter <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>>
113+ : detail::BufferFormatterBase<USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>> {
114+ using BaseType = detail::BufferFormatterBase<USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>>;
115115 using BaseType::BaseType;
116116
117117 template <typename Buffer>
@@ -149,28 +149,27 @@ struct StrongTypedefParser<StrongTypedef, true> : BufferParserBase<StrongTypedef
149149
150150} // namespace detail
151151
152- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
153- struct BufferParser <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >>
152+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
153+ struct BufferParser <USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>>
154154 : detail::StrongTypedefParser<
155- USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >,
155+ USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>,
156156 detail::kParserRequiresTypeCategories <T>> {
157157 using BaseType = detail::StrongTypedefParser<
158- USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >,
158+ USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>,
159159 detail::kParserRequiresTypeCategories <T>>;
160160 using BaseType::BaseType;
161161};
162162
163163// StrongTypedef template mapping specialization
164- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
164+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
165165struct CppToPg <
166- USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable>,
167- std::enable_if_t <!traits::kIsStrongTypedefDirectlyMapped <Tag, T, Ops, Enable> && traits::kIsMappedToPg <T>>>
168- : CppToPg<T> {};
166+ USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>,
167+ std::enable_if_t <!traits::kIsStrongTypedefDirectlyMapped <Tag, T, Ops> && traits::kIsMappedToPg <T>>> : CppToPg<T> {};
169168
170169namespace traits {
171170
172- template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops, typename Enable >
173- struct ParserBufferCategory <BufferParser<USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops, Enable >>>
171+ template <typename Tag, typename T, USERVER_NAMESPACE::utils::StrongTypedefOps Ops>
172+ struct ParserBufferCategory <BufferParser<USERVER_NAMESPACE::utils::StrongTypedef<Tag, T, Ops>>>
174173 : ParserBufferCategory<typename traits::IO<T>::ParserType> {};
175174
176175} // namespace traits
0 commit comments