From 77f1b1f0fe27778750bb9b9aa53f6bc42d5e5843 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Fri, 4 Jan 2013 02:03:41 -0800 Subject: Revert shared_ptr 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 --- parser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'parser.cpp') diff --git a/parser.cpp b/parser.cpp index f418df8c..361c3d0f 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(shared_ptr()) + 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 new_io; + std::auto_ptr 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; -- cgit v1.2.3