about summary refs log tree commit diff
path: root/third_party/nix/src/libexpr/names.hh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-21T04·43+0100
committerVincent Ambo <tazjin@google.com>2020-05-21T04·43+0100
commita162f4e8258ce1d401bc1cdb018e1212db80772d (patch)
treecf78df573c740ec054aea483101be29e5fa06e8c /third_party/nix/src/libexpr/names.hh
parentb97307056da53f094ab46e12f87d6a3f0a2be79f (diff)
refactor(3p/nix/libexpr): Use std::string as qualified type r/797
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*
Diffstat (limited to 'third_party/nix/src/libexpr/names.hh')
-rw-r--r--third_party/nix/src/libexpr/names.hh10
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/nix/src/libexpr/names.hh b/third_party/nix/src/libexpr/names.hh
index bd2aa1a11552..e2ddb5cb993e 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