h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-28 01:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Revert shared_ptr<io_data_t> changes until kinks are ironed out

Browse Source 
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 f3c8f535a4, reversing
changes made to b02f6cf3bc.

Also reverts ac023f7588 and a79d3c680c
This commit is contained in:
ridiculousfish
2013-01-04 02:03:41 -08:00
parent a79d3c680c
commit 77f1b1f0fe
7 changed files with 119 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parser.cpp
View File

@@ -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;