diff options
Diffstat (limited to 'project2/xmlObjectLoader.cpp')
| -rw-r--r-- | project2/xmlObjectLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/project2/xmlObjectLoader.cpp b/project2/xmlObjectLoader.cpp index cfbf1a4..aa1873b 100644 --- a/project2/xmlObjectLoader.cpp +++ b/project2/xmlObjectLoader.cpp @@ -3,7 +3,7 @@ #include <stdio.h> unsigned int LoaderBase::depth = 0; -std::set<Project2SourceObject> LoaderBase::loadedObjects; +std::set<SourceObjectPtr> LoaderBase::loadedObjects; LoaderBase::ElementLoaderMap & LoaderBase::getMap() @@ -34,7 +34,7 @@ LoaderBase::collectAll(const xmlpp::Element * node, bool childrenOnly) const Glib::ustring name = node->get_name(); unsigned int stored = 0; for(ElementLoaderMap::const_iterator i = getMap().lower_bound(name); i != getMap().upper_bound(name); i++) { - Project2SourceObject o = i->second->go(node); + SourceObjectPtr o = i->second->go(node); created += 1; loadedObjects.insert(o); BOOST_FOREACH(std::set<boost::intrusive_ptr<Storer> >::value_type s, supportedStorers) { @@ -65,7 +65,7 @@ LoaderBase::collectAll(const CommonObjects * co, const xmlpp::Element * node, bo throw std::logic_error("Cannot set CommonObjects in subloader"); } collectAll(node, childrenOnly); - BOOST_FOREACH(Project2SourceObject o, loadedObjects) { + BOOST_FOREACH(SourceObjectPtr o, loadedObjects) { o->loadComplete(co); } loadedObjects.clear(); |