diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-08-20T14·11+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-08-20T14·11+0000 |
commit | 956801fcc2ac75fd4041f61619451d2935fa2598 (patch) | |
tree | 7eed97a30df7dc61bbc065a4921ee143d29f7291 /src/nix.cc | |
parent | 624c48260f1b4eec86daa0da5f33d4cbb963a361 (diff) |
* Use maps and sets in the FState data type. This ensures normalisation of
slices and derivations w.r.t. order of paths, slice elements, etc.
Diffstat (limited to 'src/nix.cc')
-rw-r--r-- | src/nix.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix.cc b/src/nix.cc index 704442c313e4..04195e8d4428 100644 --- a/src/nix.cc +++ b/src/nix.cc @@ -193,7 +193,7 @@ static void opQuery(Strings opFlags, Strings opArgs) string label, shape; if (fs.type == FState::fsDerive) { - for (FSIds::iterator i = fs.derive.inputs.begin(); + for (FSIdSet::iterator i = fs.derive.inputs.begin(); i != fs.derive.inputs.end(); i++) { workList.push_back(*i); @@ -209,7 +209,7 @@ static void opQuery(Strings opFlags, Strings opArgs) } else if (fs.type == FState::fsSlice) { - label = baseNameOf((*fs.slice.elems.begin()).path); + label = baseNameOf((*fs.slice.elems.begin()).first); shape = "ellipse"; if (isHash(string(label, 0, Hash::hashSize * 2)) && label[Hash::hashSize * 2] == '-') |