aboutsummaryrefslogtreecommitdiffhomepage
path: root/parser.cpp
diff options
context:
space:
mode:
authorGravatar Cheer Xiao <xiaqqaix@gmail.com>2013-01-07 23:04:55 +0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-01-11 14:18:10 -0800
commitb66233de786ec1b136c84fb2ec0afcce0e107e00 (patch)
tree3efdb0181d69d6d429e0ffca737b527e19cc5cbd /parser.cpp
parentff49792f44196f41156547efdf615bb2b52fcaaa (diff)
Revert "Revert shared_ptr<io_data_t> changes until kinks are ironed out"
Diffstat (limited to 'parser.cpp')
-rw-r--r--parser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/parser.cpp b/parser.cpp
index 9e28020f..49f6b62d 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -377,7 +377,7 @@ parser_t::parser_t(enum parser_type_t type, bool errors) :
job_start_pos(0),
eval_level(-1),
current_block(NULL),
- block_io(NULL)
+ block_io(shared_ptr<io_data_t>())
{
}
@@ -1495,7 +1495,7 @@ void parser_t::parse_job_argument_list(process_t *p,
case TOK_REDIRECT_NOCLOB:
{
int type = tok_last_type(tok);
- std::auto_ptr<io_data_t> new_io;
+ shared_ptr<io_data_t> new_io;
wcstring target;
bool has_target = false;
wchar_t *end;
@@ -1633,7 +1633,7 @@ void parser_t::parse_job_argument_list(process_t *p,
}
}
- j->io.push_back(new_io.release());
+ j->io.push_back(new_io);
}
break;