diff options
Diffstat (limited to 'project2/streams/viewStream.cpp')
| -rw-r--r-- | project2/streams/viewStream.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/project2/streams/viewStream.cpp b/project2/streams/viewStream.cpp index 28efc17..29917f6 100644 --- a/project2/streams/viewStream.cpp +++ b/project2/streams/viewStream.cpp @@ -27,23 +27,23 @@ class ViewStream : public Stream, public ViewHost { Stream(p), ViewHost(p) { - p->script->loader.addLoadTarget(p, Storer::into<PresenterLoader>(&presenter, Scripted)); + p->script->loader.addLoadTarget(p, Storer::into<PresenterLoader>(&presenter, Scripted, (ExecContext*)NULL)); } - void runStream(const Stream::Sink & s) const + void runStream(const Stream::Sink & s, ExecContext * ec) const { - TransformSourcePtr t = boost::dynamic_pointer_cast<TransformSource>(getPresenter()); + TransformSourcePtr t = boost::dynamic_pointer_cast<TransformSource>(getPresenter(ec)); if (t) { boost::iostreams::stream<SinkStream> strm(s); ostreamWrapper * o = new ostreamWrapper(strm); - executeViews(); - t->addTarget(o); + executeViews(ec); + t->addTarget(o, ec, NULL); ScopeObject remove([&t] { t->clearTargets(); }); - doTransforms(); + doTransforms(ec); } } private: - MultiRowSetPresenterPtr getPresenter() const { + MultiRowSetPresenterPtr getPresenter(ExecContext *) const { return presenter; } MultiRowSetPresenterPtr presenter; |