From a162f4e8258ce1d401bc1cdb018e1212db80772d Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 21 May 2020 05:43:22 +0100 Subject: refactor(3p/nix/libexpr): Use std::string as qualified type 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* --- third_party/nix/src/libexpr/primops/context.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libexpr/primops/context.cc') diff --git a/third_party/nix/src/libexpr/primops/context.cc b/third_party/nix/src/libexpr/primops/context.cc index 7fa33bd87fb2..efc94d91ced8 100644 --- a/third_party/nix/src/libexpr/primops/context.cc +++ b/third_party/nix/src/libexpr/primops/context.cc @@ -7,7 +7,7 @@ namespace nix { static void prim_unsafeDiscardStringContext(EvalState& state, const Pos& pos, Value** args, Value& v) { PathSet context; - string s = state.coerceToString(pos, *args[0], context); + std::string s = state.coerceToString(pos, *args[0], context); mkString(v, s, PathSet()); } @@ -32,7 +32,7 @@ static RegisterPrimOp r2("__hasContext", 1, prim_hasContext); static void prim_unsafeDiscardOutputDependency(EvalState& state, const Pos& pos, Value** args, Value& v) { PathSet context; - string s = state.coerceToString(pos, *args[0], context); + std::string s = state.coerceToString(pos, *args[0], context); PathSet context2; for (auto& p : context) { @@ -76,7 +76,7 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args, auto contextInfos = std::map(); for (const auto& p : context) { Path drv; - string output; + std::string output; const Path* path = &p; if (p.at(0) == '=') { drv = string(p, 1); -- cgit 1.4.1