From a162f4e8258ce1d401bc1cdb018e1212db80772d Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
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/names.hh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'third_party/nix/src/libexpr/names.hh')

diff --git a/third_party/nix/src/libexpr/names.hh b/third_party/nix/src/libexpr/names.hh
index bd2aa1a115..e2ddb5cb99 100644
--- a/third_party/nix/src/libexpr/names.hh
+++ b/third_party/nix/src/libexpr/names.hh
@@ -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
-- 
cgit 1.4.1