diff options
Diffstat (limited to 'project2/common/scriptLoader.h')
| -rw-r--r-- | project2/common/scriptLoader.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/project2/common/scriptLoader.h b/project2/common/scriptLoader.h index 00ad9b5..ca888cf 100644 --- a/project2/common/scriptLoader.h +++ b/project2/common/scriptLoader.h @@ -24,6 +24,7 @@ class LoaderBase { typedef boost::intrusive_ptr<Storer> StorerPtr; typedef std::vector<StorerPtr> StorerPtrs; typedef std::map<ScriptNodePtr, StorerPtrs> Targets; + typedef std::set<SourceObject *> LoadedObjects; LoaderBase(); virtual ~LoaderBase(); @@ -34,12 +35,9 @@ class LoaderBase { void discardLoadTargets(); private: - void collectAll(ScriptNodePtr script, bool childrenOnly, const StorerPtrs & sts) const; + void collectAll(ScriptNodePtr script, LoadedObjects &, bool childrenOnly, const StorerPtrs & sts) const; static ScriptNodePtr getSub(ScriptNodePtr root, const Glib::ustring & name, bool required); Targets targets; - static unsigned int depth; - friend class SourceObject; - static std::set<SourceObject *> loadedObjects; const bool recursive; |