diff options
| author | Josh Gao <jmgao@google.com> | 2016-09-14 12:47:02 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2016-09-19 11:24:58 -0700 |
| commit | 5d1b1a8b91a35f465e5af146bcfd5d7b4346854c (patch) | |
| tree | 1f5e7f45cad013f8f3f3e264c4fbaf6d0cf1ec02 /adb | |
| parent | 36b88ce9754424a9ed6742dbc1931a0e9a1b8116 (diff) | |
| download | system_core-5d1b1a8b91a35f465e5af146bcfd5d7b4346854c.tar.gz system_core-5d1b1a8b91a35f465e5af146bcfd5d7b4346854c.tar.bz2 system_core-5d1b1a8b91a35f465e5af146bcfd5d7b4346854c.zip | |
base: rename unique_fd::clear() to unique_fd::reset().
unique_fd is modeled on unique_ptr, so make this consistent.
Test: m checkbuild
Change-Id: Ia6a77095dc18746fbb432e96bb8dccfc049c57f6
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/shell_service.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp index 01e206a58..b0b31f1b8 100644 --- a/adb/shell_service.cpp +++ b/adb/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(); } } } |
