diff options
Diffstat (limited to 'project2/ice/iceDaemon.cpp')
| -rw-r--r-- | project2/ice/iceDaemon.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/project2/ice/iceDaemon.cpp b/project2/ice/iceDaemon.cpp index e6769b5..2330d02 100644 --- a/project2/ice/iceDaemon.cpp +++ b/project2/ice/iceDaemon.cpp @@ -73,7 +73,7 @@ IceDaemon::setup() const Logger()->messagebf(LOG_DEBUG, " %s installing servants...", __PRETTY_FUNCTION__); for(auto p : AdHoc::PluginManager::getDefault()->getAll<IceDaemonAdapterHandlerFactory>()) { - p->implementation()->create(this)->add(adapter, ic); + p->implementation()->create(shared_from_this())->add(adapter, ic); } Logger()->messagebf(LOG_DEBUG, " %s starting...", __PRETTY_FUNCTION__); @@ -96,7 +96,7 @@ class IceDaemonViewHost : public virtual CommonObjects, public virtual CheckHost CommonObjects(s), CheckHost(s) { - s->script->loader.addLoadTarget(s, Storer::into<FlatViewFactory>(&view)); + s->script.lock()->loader.addLoadTarget(s, Storer::into<FlatViewFactory>(&view)); } void executeView(RowSetPresenterPtr presenter, ExecContext * ec) const { @@ -111,7 +111,7 @@ class IceDaemonViewHost : public virtual CommonObjects, public virtual CheckHost } } private: - typedef boost::intrusive_ptr<FlatView> ViewPtr; + typedef std::shared_ptr<FlatView> ViewPtr; ViewPtr view; }; @@ -141,9 +141,9 @@ void IceDaemon::executeView(const std::string & name, Slicer::ModelPartPtr p, const ParamMap & pm) const { ScriptNodePtr s = ScriptReader::resolveScript(IceDaemon::viewRoot, name, false)->root(); - boost::intrusive_ptr<IceDaemonViewHost> v = new IceDaemonViewHost(s); + auto v = std::make_shared<IceDaemonViewHost>(s); IceCallContext icc(pm); - v->executeView(new IceViewSerializer(p), &icc); + v->executeView(std::make_shared<IceViewSerializer>(p), &icc); } class IceDaemonTaskHost : public TaskHost { @@ -168,7 +168,7 @@ void IceDaemon::executeTask(const std::string & name, const ParamMap & pm) const { ScriptNodePtr s = ScriptReader::resolveScript(IceDaemon::taskRoot, name, false)->root(); - boost::intrusive_ptr<IceDaemonTaskHost> t = new IceDaemonTaskHost(s); + auto t = std::make_shared<IceDaemonTaskHost>(s); IceCallContext icc(pm); t->executeTask(&icc); } @@ -176,7 +176,7 @@ IceDaemon::executeTask(const std::string & name, const ParamMap & pm) const IceCompile::Ptr IceDaemon::GetComponentCompiler(const std::string & slice, const IceCompile::Deps & deps) { - return IceCompile::Ptr(new BuildDaemon(slice, deps)); + return std::make_shared<BuildDaemon>(slice, deps); } void |