nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-25 11:49:35 +01:00
Code Activity

No inheritance for TextInfo and FixedOutputInfo

Browse source
This commit is contained in:
John Ericson 2023-02-28 12:13:43 -05:00
parent 85bb865d20
commit d381248ec0
17 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/content-address.hh
View file

@ -111,18 +111,20 @@ struct StoreReferences {
*/
// This matches the additional info that we need for makeTextPath
struct TextInfo : TextHash {
struct TextInfo {
TextHash hash;
// References for the paths, self references disallowed
StorePathSet references;
GENERATE_CMP(TextInfo, *(const TextHash *)me, me->references);
GENERATE_CMP(TextInfo, me->hash, me->references);
};
struct FixedOutputInfo : FixedOutputHash {
struct FixedOutputInfo {
FixedOutputHash hash;
// References for the paths
StoreReferences references;
GENERATE_CMP(FixedOutputInfo, *(const FixedOutputHash *)me, me->references);
GENERATE_CMP(FixedOutputInfo, me->hash, me->references);
};
typedef std::variant<