File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ class EnumPropertyType<string typeName = ""> : PropertyType<typeName> {}
39
39
/// Supports optional values by using the null representation.
40
40
class RefPropertyType<string className> : PropertyType<className # "*"> {
41
41
let PackOptional =
42
- "value ? *value : nullptr";
42
+ "value.value_or( nullptr) ";
43
43
let UnpackOptional =
44
44
"value ? std::optional<" # CXXName # ">(value) : std::nullopt";
45
45
}
Original file line number Diff line number Diff line change @@ -293,7 +293,7 @@ class FileManager : public RefCountedBase<FileManager> {
293
293
bool RequiresNullTerminator = true ,
294
294
std::optional<int64_t > MaybeLimit = std::nullopt) const {
295
295
return getBufferForFileImpl (Filename,
296
- /* FileSize=*/ ( MaybeLimit ? *MaybeLimit : -1 ),
296
+ /* FileSize=*/ MaybeLimit. value_or ( -1 ),
297
297
isVolatile, RequiresNullTerminator);
298
298
}
299
299
Original file line number Diff line number Diff line change @@ -757,8 +757,8 @@ class YAMLConverter {
757
757
OutInfo.addTypeInfo (idx++, N);
758
758
audited = Nullability.size () > 0 || ReturnNullability;
759
759
if (audited)
760
- OutInfo.addTypeInfo (0 , ReturnNullability ? *ReturnNullability
761
- : NullabilityKind::NonNull);
760
+ OutInfo.addTypeInfo (0 ,
761
+ ReturnNullability. value_or ( NullabilityKind::NonNull) );
762
762
if (!audited)
763
763
return ;
764
764
OutInfo.NullabilityAudited = audited;
You can’t perform that action at this time.
0 commit comments