1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 13:41:15 +02:00

Remove some designated initializers

With the switch to C++20, the rules became more strict, and we can no
longer initialize base classes. Make them comments instead.

(BTW
https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p2287r1.html
this offers some new syntax for this use-case. Hopefully this will be
adopted and we can eventually use it.)
This commit is contained in:
John Ericson 2023-02-01 11:25:56 -05:00
parent 59d3175649
commit ee9eb83a84
16 changed files with 21 additions and 21 deletions

View file

@ -31,7 +31,7 @@ std::optional<ContentAddressWithReferences> ValidPathInfo::contentAddressWithRef
assert(references.count(path) == 0);
return TextInfo {
th,
.references = references,
/* .references = */ references,
};
},
[&](const FixedOutputHash & foh) -> ContentAddressWithReferences {
@ -43,7 +43,7 @@ std::optional<ContentAddressWithReferences> ValidPathInfo::contentAddressWithRef
}
return FixedOutputInfo {
foh,
.references = {
/* .references = */ {
.others = std::move(refs),
.self = hasSelfReference,
},