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

6
third_party/nix/src/libexpr/attr-path.cc vendored
View file

@ -5,9 +5,9 @@
namespace nix {
static Strings parseAttrPath(const string& s) {
static Strings parseAttrPath(const std::string& s) {
Strings res;
string cur;
std::string cur;
string::const_iterator i = s.begin();
while (i != s.end()) {
if (*i == '.') {
@ -36,7 +36,7 @@ static Strings parseAttrPath(const string& s) {
return res;
}
Value* findAlongAttrPath(EvalState& state, const string& attrPath,
Value* findAlongAttrPath(EvalState& state, const std::string& attrPath,
Bindings& autoArgs, Value& vIn) {
Strings tokens = parseAttrPath(attrPath);