summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2016-09-21 01:03:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-09-21 01:03:06 +0000
commit4902722ec3e65802f544c3a06fe1efa26c6ff54b (patch)
tree9ef2fab35b2db6ae8f22c62ed487818614ed1f9a
parent447f9cc266bd33d5ff7b25bb0753f3f7fe6580a2 (diff)
parenta084b5aa5edf9096cc26036aa331d5ac6f5372a2 (diff)
downloadadb-4902722ec3e65802f544c3a06fe1efa26c6ff54b.tar.gz
Merge "base: rename unique_fd::clear() to unique_fd::reset()."
-rw-r--r--shell_service.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell_service.cpp b/shell_service.cpp
index 01e206a..b0b31f1 100644
--- a/shell_service.cpp
+++ b/shell_service.cpp
@@ -493,10 +493,10 @@ void Subprocess::PassDataStreams() {
// We also need to close the pipes connected to the child process
// so that if it ignores SIGHUP and continues to write data it
// won't fill up the pipe and block.
- stdinout_sfd_.clear();
- stderr_sfd_.clear();
+ stdinout_sfd_.reset();
+ stderr_sfd_.reset();
}
- dead_sfd->clear();
+ dead_sfd->reset();
}
}
}