aboutsummaryrefslogtreecommitdiffhomepage
path: root/proc.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-01-04 02:03:41 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-01-04 02:05:30 -0800
commit77f1b1f0fe27778750bb9b9aa53f6bc42d5e5843 (patch)
treedf52ec2bdf258a54677eef48d717335f59f2f478 /proc.cpp
parenta79d3c680c9548566309121630dadc94e48934c4 (diff)
Revert shared_ptr<io_data_t> changes until kinks are ironed out
https://github.com/fish-shell/fish-shell/pull/487 Revert "Merge branch 'oo-io' of git://github.com/xiaq/fish-shell into xiaq-oo-io" This reverts commit f3c8f535a48d5fdd518bd60879ade948bc8be7e6, reversing changes made to b02f6cf3bc4343cf3e068dee3cb46de7139a5a27. Also reverts ac023f7588e562a03fdea7fd2feda487f18827c7 and a79d3c680c9548566309121630dadc94e48934c4
Diffstat (limited to 'proc.cpp')
-rw-r--r--proc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/proc.cpp b/proc.cpp
index 1b37f149..7ff41f4a 100644
--- a/proc.cpp
+++ b/proc.cpp
@@ -869,7 +869,7 @@ static int select_try(job_t *j)
for (size_t idx = 0; idx < j->io.size(); idx++)
{
- const io_data_t *d = j->io.at(idx).get();
+ const io_data_t *d = j->io.at(idx);
if (d->io_mode == IO_BUFFER)
{
int fd = d->param1.pipe_fd[0];
@@ -909,7 +909,7 @@ static void read_try(job_t *j)
*/
for (size_t idx = 0; idx < j->io.size(); idx++)
{
- io_data_t *d = j->io.at(idx).get();
+ io_data_t *d = j->io.at(idx);
if (d->io_mode == IO_BUFFER)
{
buff=d;