diff options
| author |  Cheer Xiao <xiaqqaix@gmail.com> | 2013-01-07 23:04:55 +0800 |
|---|---|---|
| committer |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-01-11 14:18:10 -0800 |
| commit | b66233de786ec1b136c84fb2ec0afcce0e107e00 (patch) | |
| tree | 3efdb0181d69d6d429e0ffca737b527e19cc5cbd /postfork.cpp | |
| parent | ff49792f44196f41156547efdf615bb2b52fcaaa (diff) | |
Revert "Revert shared_ptr<io_data_t> changes until kinks are ironed out"
This reverts commit 77f1b1f0fe27778750bb9b9aa53f6bc42d5e5843.
Diffstat (limited to 'postfork.cpp')
| -rw-r--r-- | postfork.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/postfork.cpp b/postfork.cpp index a7d3b5ed..5afb72bb 100644 --- a/postfork.cpp +++ b/postfork.cpp @@ -117,7 +117,7 @@ static void free_redirected_fds_from_pipes(io_chain_t &io_chain) for (size_t j = 0; j < max; j++) { /* We're only interested in pipes */ - io_data_t *possible_conflict = io_chain.at(j); + io_data_t *possible_conflict = io_chain.at(j).get(); if (possible_conflict->io_mode != IO_PIPE && possible_conflict->io_mode != IO_BUFFER) continue; @@ -166,7 +166,7 @@ static int handle_child_io(io_chain_t &io_chain) free_redirected_fds_from_pipes(io_chain); for (size_t idx = 0; idx < io_chain.size(); idx++) { - io_data_t *io = io_chain.at(idx); + io_data_t *io = io_chain.at(idx).get(); int tmp; if (io->io_mode == IO_FD && io->fd == io->param1.old_fd) @@ -441,7 +441,7 @@ bool fork_actions_make_spawn_properties(posix_spawnattr_t *attr, posix_spawn_fil for (size_t idx = 0; idx < j->io.size(); idx++) { - const io_data_t *io = j->io.at(idx); + shared_ptr<const io_data_t> io = j->io.at(idx); if (io->io_mode == IO_FD && io->fd == io->param1.old_fd) { |