aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader.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 /reader.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 'reader.cpp')
-rw-r--r--reader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/reader.cpp b/reader.cpp
index 6abde371..59294339 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -1014,7 +1014,7 @@ static void run_pager(const wcstring &prefix, int is_quoted, const std::vector<c
is_quoted?L"-q":L"",
prefix_esc.c_str());
- shared_ptr<io_data_t> in(io_buffer_create(true));
+ io_data_t *in = io_buffer_create(true);
in->fd = 3;
escaped_separator = escape(COMPLETE_SEP_STR, 1);
@@ -1083,7 +1083,7 @@ static void run_pager(const wcstring &prefix, int is_quoted, const std::vector<c
term_donate();
- shared_ptr<io_data_t> out(io_buffer_create(false));
+ io_data_t *out = io_buffer_create(false);
out->fd = 4;
parser_t &parser = parser_t::principal_parser();
@@ -1093,7 +1093,7 @@ static void run_pager(const wcstring &prefix, int is_quoted, const std::vector<c
parser.eval(cmd, io_chain, TOP);
term_steal();
- io_buffer_read(out.get());
+ io_buffer_read(out);
int nil=0;
out->out_buffer_append((char *)&nil, 1);