File tree Expand file tree Collapse file tree 7 files changed +4
-44
lines changed
yt_proto/yt/client/api/rpc_proxy/proto Expand file tree Collapse file tree 7 files changed +4
-44
lines changed Original file line number Diff line number Diff line change @@ -124,10 +124,6 @@ T CheckedEnumCast(S value)
124
124
{
125
125
T result;
126
126
if (!TryEnumCast<T>(value, &result)) {
127
- if constexpr (TEnumHasDefaultValue<T>::value) {
128
- return GetDefaultValue (T{});
129
- }
130
-
131
127
throw TSimpleException (Sprintf (" Error casting %s value \" %d\" to enum %s" ,
132
128
TypeName<S>().c_str (),
133
129
static_cast <int >(value),
Original file line number Diff line number Diff line change @@ -197,20 +197,6 @@ constexpr bool None(E value) noexcept;
197
197
198
198
// //////////////////////////////////////////////////////////////////////////////
199
199
200
- template <typename E, typename = void >
201
- requires TEnumTraits<E>::IsEnum
202
- struct TEnumHasDefaultValue
203
- : std::false_type
204
- { };
205
-
206
- template <typename E>
207
- requires TEnumTraits<E>::IsEnum
208
- struct TEnumHasDefaultValue <E, std::void_t <decltype (GetDefaultValue(std::declval<E>()))>>
209
- : std::is_same<decltype (GetDefaultValue(std::declval<E>())), E>
210
- { };
211
-
212
- // //////////////////////////////////////////////////////////////////////////////
213
-
214
200
} // namespace NYT
215
201
216
202
#define ENUM_INL_H_
Original file line number Diff line number Diff line change @@ -87,11 +87,6 @@ T ParseEnum(TStringBuf value)
87
87
if (auto optionalResult = TryParseEnum<T>(value)) {
88
88
return *optionalResult;
89
89
}
90
-
91
- if constexpr (TEnumHasDefaultValue<T>::value) {
92
- return GetDefaultValue (T{});
93
- }
94
-
95
90
NYT::NDetail::ThrowMalformedEnumValueException (TEnumTraits<T>::GetTypeName (), value);
96
91
}
97
92
Original file line number Diff line number Diff line change @@ -9,11 +9,5 @@ const TString LocalNetworkName("local");
9
9
10
10
// //////////////////////////////////////////////////////////////////////////////
11
11
12
- EMultiplexingBand GetDefaultValue (EMultiplexingBand)
13
- {
14
- return EMultiplexingBand::Default;
15
- }
16
-
17
- // //////////////////////////////////////////////////////////////////////////////
18
-
19
12
} // namespace NYT::NBus
13
+
Original file line number Diff line number Diff line change @@ -36,8 +36,6 @@ DEFINE_ENUM(EMultiplexingBand,
36
36
((RealTime) (4 ))
37
37
);
38
38
39
- EMultiplexingBand GetDefaultValue (EMultiplexingBand);
40
-
41
39
YT_DEFINE_ERROR_ENUM (
42
40
((TransportError) (100 ))
43
41
((SslError) (119 ))
@@ -61,3 +59,4 @@ extern const TString LocalNetworkName;
61
59
// //////////////////////////////////////////////////////////////////////////////
62
60
63
61
} // namespace NYT::NBus
62
+
Original file line number Diff line number Diff line change @@ -181,11 +181,7 @@ template <class T>
181
181
requires TEnumTraits<T>::IsEnum && (!TEnumTraits<T>::IsBitEnum)
182
182
void FromProto (T* original, int serialized)
183
183
{
184
- if constexpr (TEnumHasDefaultValue<T>::value) {
185
- *original = CheckedEnumCast<T>(serialized);
186
- } else {
187
- *original = static_cast <T>(serialized);
188
- }
184
+ *original = static_cast <T>(serialized);
189
185
}
190
186
191
187
template <class T >
@@ -199,11 +195,7 @@ template <class T>
199
195
requires TEnumTraits<T>::IsBitEnum
200
196
void FromProto (T* original, ui64 serialized)
201
197
{
202
- if constexpr (TEnumHasDefaultValue<T>::value) {
203
- *original = CheckedEnumCast<T>(serialized);
204
- } else {
205
- *original = static_cast <T>(serialized);
206
- }
198
+ *original = static_cast <T>(serialized);
207
199
}
208
200
209
201
// //////////////////////////////////////////////////////////////////////////////
Original file line number Diff line number Diff line change @@ -225,8 +225,6 @@ enum EMultiplexingBand
225
225
MB_CONTROL = 1 ;
226
226
MB_HEAVY = 2 ;
227
227
MB_INTERACTIVE = 3 ;
228
- MB_REAL_TIME = 4 ;
229
- MB_JOURNAL = 5 ;
230
228
}
231
229
232
230
enum ETableSchemaModification
You can’t perform that action at this time.
0 commit comments