wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

nix-store -r: Handle symlinks to store paths

Browse source 
Fixes #3270.
This commit is contained in:
Eelco Dolstra 2019-12-16 19:11:47 +01:00
parent 14d82baba4
commit 54bf5ba422
11 changed files with 67 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/util.cc
View file

@ -1186,7 +1186,7 @@ void _interrupted()
//////////////////////////////////////////////////////////////////////
template<class C> C tokenizeString(const string & s, const string & separators)
template<class C> C tokenizeString(std::string_view s, const string & separators)
{
C result;
string::size_type pos = s.find_first_not_of(separators, 0);
@ -1200,9 +1200,9 @@ template<class C> C tokenizeString(const string & s, const string & separators)
return result;
}
template Strings tokenizeString(const string & s, const string & separators);
template StringSet tokenizeString(const string & s, const string & separators);
template vector<string> tokenizeString(const string & s, const string & separators);
template Strings tokenizeString(std::string_view s, const string & separators);
template StringSet tokenizeString(std::string_view s, const string & separators);
template vector<string> tokenizeString(std::string_view s, const string & separators);
string concatStringsSep(const string & sep, const Strings & ss)

2
src/libutil/util.hh
View file

@ -340,7 +340,7 @@ MakeError(FormatError, Error);
/* String tokenizer. */
template<class C> C tokenizeString(const string & s, const string & separators = " \t\n\r");
template<class C> C tokenizeString(std::string_view s, const string & separators = " \t\n\r");
/* Concatenate the given strings with a separator between the