diff options
Diffstat (limited to 'project2/common/scriptLoader.h')
| -rw-r--r-- | project2/common/scriptLoader.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/project2/common/scriptLoader.h b/project2/common/scriptLoader.h index c5cf853..c9c48b5 100644 --- a/project2/common/scriptLoader.h +++ b/project2/common/scriptLoader.h @@ -3,8 +3,6 @@ #include <set> #include <string> -#include <boost/intrusive_ptr.hpp> -#include "intrusivePtrBase.h" #include "sourceObject.h" #include <factory.h> #include "scripts_fwd.h" @@ -17,11 +15,11 @@ class CommonObjects; class Storer; class ScriptReader; class SourceObject; -typedef boost::intrusive_ptr<SourceObject> SourceObjectPtr; +typedef std::shared_ptr<SourceObject> SourceObjectPtr; class DLL_PUBLIC LoaderBase { public: - typedef boost::intrusive_ptr<Storer> StorerPtr; + typedef std::shared_ptr<Storer> StorerPtr; typedef std::vector<StorerPtr> StorerPtrs; typedef std::map<ScriptNodePtr, StorerPtrs> Targets; typedef std::set<SourceObject *> LoadedObjects; @@ -30,8 +28,8 @@ class DLL_PUBLIC LoaderBase { virtual ~LoaderBase(); void collectAll(const CommonObjects * co, bool childrenOnly); - void addLoadTarget(ScriptNodePtr src, boost::intrusive_ptr<Storer> target); - void addLoadTargetSub(ScriptNodePtr src, const Glib::ustring & name, bool required, boost::intrusive_ptr<Storer> target); + void addLoadTarget(ScriptNodePtr src, std::shared_ptr<Storer> target); + void addLoadTargetSub(ScriptNodePtr src, const Glib::ustring & name, bool required, std::shared_ptr<Storer> target); void discardLoadTargets(); private: |