maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libexpr): Use std::string as qualified type

Browse source 
Replaces most uses of `string` with `std::string`.

This came up because I removed the "types.hh" import from
"symbol-table.hh", which percolated through a bunch of files where
`string` was suddenly no longer defined ... *sigh*
This commit is contained in:
Vincent Ambo 2020-05-21 05:43:22 +01:00
parent b97307056d
commit a162f4e825
26 changed files with 196 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/libexpr/names.hh vendored
View file

@ -8,13 +8,13 @@
namespace nix {
struct DrvName {
string fullName;
string name;
string version;
std::string fullName;
std::string name;
std::string version;
unsigned int hits;
DrvName();
DrvName(const string& s);
DrvName(const std::string& s);
bool matches(DrvName& n);
private:
@ -25,7 +25,7 @@ typedef list<DrvName> DrvNames;
string nextComponent(string::const_iterator& p,
const string::const_iterator end);
int compareVersions(const string& v1, const string& v2);
int compareVersions(const std::string& v1, const std::string& v2);
DrvNames drvNamesFromArgs(const Strings& opArgs);
} // namespace nix