about summary refs log tree commit diff
path: root/third_party/nix/src/build-remote
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-24T21·29+0100
committerVincent Ambo <tazjin@google.com>2020-05-24T21·29+0100
commit838f86b0fd880b26539664140f04e5d16669dad8 (patch)
treec8fee2f0c136fbe5bb0735604e2f04d5b02698ba /third_party/nix/src/build-remote
parentf30b2e610d9e612504a9f6460e0cc83413b80aeb (diff)
style(3p/nix): Remove 'using std::*' from types.hh r/840
It is considered bad form to use things from includes in headers, as
these directives propagate to everywhere else and can make it
confusing.

types.hh (which is includes almost literally everywhere) had some of
these directives, which this commit removes.
Diffstat (limited to 'third_party/nix/src/build-remote')
-rw-r--r--third_party/nix/src/build-remote/build-remote.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/nix/src/build-remote/build-remote.cc b/third_party/nix/src/build-remote/build-remote.cc
index 9403d3c35e..351c660db1 100644
--- a/third_party/nix/src/build-remote/build-remote.cc
+++ b/third_party/nix/src/build-remote/build-remote.cc
@@ -30,7 +30,7 @@ std::string escapeUri(std::string uri) {
   return uri;
 }
 
-static string currentLoad;
+static std::string currentLoad;
 
 static AutoCloseFD openSlotLock(const Machine& m, unsigned long long slot) {
   return openLockFile(fmt("%s/%s-%d", currentLoad, escapeUri(m.storeUri), slot),
@@ -86,8 +86,8 @@ static int _main(int argc, char* argv[]) {
       return 0;
     }
 
-    string drvPath;
-    string storeUri;
+    std::string drvPath;
+    std::string storeUri;
 
     while (true) {
       try {