diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2013-01-04 02:03:41 -0800 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-01-04 02:05:30 -0800 |
commit | 77f1b1f0fe27778750bb9b9aa53f6bc42d5e5843 (patch) | |
tree | df52ec2bdf258a54677eef48d717335f59f2f478 /parser.cpp | |
parent | a79d3c680c9548566309121630dadc94e48934c4 (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 'parser.cpp')
-rw-r--r-- | parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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(shared_ptr<io_data_t>()) + block_io(NULL) { } @@ -1495,7 +1495,7 @@ void parser_t::parse_job_argument_list(process_t *p, case TOK_REDIRECT_NOCLOB: { int type = tok_last_type(tok); - shared_ptr<io_data_t> new_io; + std::auto_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); + j->io.push_back(new_io.release()); } break; |