mirror of
https://github.com/NixOS/nix
synced 2025-07-06 17:31:47 +02:00
Merge remote-tracking branch 'upstream/master' into source-path
This commit is contained in:
commit
cb2615cf47
148 changed files with 3908 additions and 1449 deletions
|
@ -194,8 +194,10 @@ public:
|
|||
*/
|
||||
bool isAllowed(const std::set<CanonPath> & allowed) const;
|
||||
|
||||
/* Return a representation `x` of `path` relative to `this`, i.e.
|
||||
`CanonPath(this.makeRelative(x), this) == path`. */
|
||||
/**
|
||||
* Return a representation `x` of `path` relative to `this`, i.e.
|
||||
* `CanonPath(this.makeRelative(x), this) == path`.
|
||||
*/
|
||||
std::string makeRelative(const CanonPath & path) const;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue