Skip to content

Commit f31a017

Browse files
Fix template parameters for strong typedef
commit_hash:f5387527e22b580ce89b8075661a88b0fe1fc589
1 parent c5be563 commit f31a017

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

yt/yt/client/table_client/helpers-inl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,20 +313,20 @@ void FromUnversionedValue(
313313

314314
////////////////////////////////////////////////////////////////////////////////
315315

316-
template <class T, class TTag>
316+
template <class T, class TTag, TStrongTypedefOptions Options>
317317
void ToUnversionedValue(
318318
TUnversionedValue* unversionedValue,
319-
const TStrongTypedef<T, TTag>& value,
319+
const TStrongTypedef<T, TTag, Options>& value,
320320
const TRowBufferPtr& rowBuffer,
321321
int id,
322322
EValueFlags flags)
323323
{
324324
ToUnversionedValue(unversionedValue, value.Underlying(), rowBuffer, id, flags);
325325
}
326326

327-
template <class T, class TTag>
327+
template <class T, class TTag, TStrongTypedefOptions Options>
328328
void FromUnversionedValue(
329-
TStrongTypedef<T, TTag>* value,
329+
TStrongTypedef<T, TTag, Options>* value,
330330
TUnversionedValue unversionedValue)
331331
{
332332
FromUnversionedValue(&value->Underlying(), unversionedValue);

yt/yt/core/misc/protobuf_helpers-inl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,14 +647,14 @@ i64 TRefCountedProto<TProto>::GetSize() const
647647

648648
////////////////////////////////////////////////////////////////////////////////
649649

650-
template <class TSerialized, class T, class TTag>
651-
void FromProto(TStrongTypedef<T, TTag>* original, const TSerialized& serialized)
650+
template <class TSerialized, class T, class TTag, TStrongTypedefOptions Options>
651+
void FromProto(TStrongTypedef<T, TTag, Options>* original, const TSerialized& serialized)
652652
{
653653
FromProto(&original->Underlying(), serialized);
654654
}
655655

656-
template <class TSerialized, class T, class TTag>
657-
void ToProto(TSerialized* serialized, const TStrongTypedef<T, TTag>& original)
656+
template <class TSerialized, class T, class TTag, TStrongTypedefOptions Options>
657+
void ToProto(TSerialized* serialized, const TStrongTypedef<T, TTag, Options>& original)
658658
{
659659
ToProto(serialized, original.Underlying());
660660
}

yt/yt/core/misc/protobuf_helpers.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,14 @@ void FromProto(
156156

157157
////////////////////////////////////////////////////////////////////////////////
158158

159-
template <class TSerialized, class T, class TTag>
160-
void FromProto(TStrongTypedef<T, TTag>* original, const TSerialized& serialized);
159+
template <class TSerialized, class T, class TTag, TStrongTypedefOptions Options>
160+
void FromProto(TStrongTypedef<T, TTag, Options>* original, const TSerialized& serialized);
161161

162-
template <class TSerialized, class T, class TTag>
163-
void ToProto(TSerialized* serialized, const TStrongTypedef<T, TTag>& original);
162+
template <class TSerialized, class T, class TTag, TStrongTypedefOptions Options>
163+
void ToProto(TSerialized* serialized, const TStrongTypedef<T, TTag, Options>& original);
164164

165-
template <class T, class TTag>
166-
struct TProtoTraits<TStrongTypedef<T, TTag>>
165+
template <class T, class TTag, TStrongTypedefOptions Options>
166+
struct TProtoTraits<TStrongTypedef<T, TTag, Options>>
167167
{
168168
using TSerialized = T;
169169
};

yt/yt/core/ytree/serialize-inl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ void Serialize(
506506
consumer->OnStringScalar(message.SerializeAsStringOrThrow());
507507
}
508508

509-
template <class T, class TTag>
510-
void Serialize(const TStrongTypedef<T, TTag>& value, NYson::IYsonConsumer* consumer)
509+
template <class T, class TTag, TStrongTypedefOptions Options>
510+
void Serialize(const TStrongTypedef<T, TTag, Options>& value, NYson::IYsonConsumer* consumer)
511511
{
512512
Serialize(value.Underlying(), consumer);
513513
}
@@ -732,8 +732,8 @@ void Deserialize(
732732
message.ParseFromStringOrThrow(string);
733733
}
734734

735-
template <class T, class TTag>
736-
void Deserialize(TStrongTypedef<T, TTag>& value, INodePtr node)
735+
template <class T, class TTag, TStrongTypedefOptions Options>
736+
void Deserialize(TStrongTypedef<T, TTag, Options>& value, INodePtr node)
737737
{
738738
Deserialize(value.Underlying(), node);
739739
}

yt/yt/core/ytree/serialize.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ void Serialize(
177177
const T& message,
178178
NYson::IYsonConsumer* consumer);
179179

180-
template <class T, class TTag>
181-
void Serialize(const TStrongTypedef<T, TTag>& value, NYson::IYsonConsumer* consumer);
180+
template <class T, class TTag, TStrongTypedefOptions Options>
181+
void Serialize(const TStrongTypedef<T, TTag, Options>& value, NYson::IYsonConsumer* consumer);
182182

183183
void Serialize(const NStatisticPath::TStatisticPath& path, NYson::IYsonConsumer* consumer);
184184

@@ -296,8 +296,8 @@ void Deserialize(
296296
T& message,
297297
const INodePtr& node);
298298

299-
template <class T, class TTag>
300-
void Deserialize(TStrongTypedef<T, TTag>& value, INodePtr node);
299+
template <class T, class TTag, TStrongTypedefOptions Options>
300+
void Deserialize(TStrongTypedef<T, TTag, Options>& value, INodePtr node);
301301

302302
void Deserialize(NStatisticPath::TStatisticPath& path, INodePtr node);
303303

0 commit comments

Comments
 (0)