diff options
| author | randomdan <randomdan@localhost> | 2011-07-14 19:50:11 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2011-07-14 19:50:11 +0000 |
| commit | d2f60795927647c09acbeceb32efb8a29314c340 (patch) | |
| tree | 5dc1f6f9b8331a17e67863c847ea63ca97f5d92c /project2/commonObjects.cpp | |
| parent | Fix unused_result warning when compiled with optimization enabled (diff) | |
| download | project2-d2f60795927647c09acbeceb32efb8a29314c340.tar.bz2 project2-d2f60795927647c09acbeceb32efb8a29314c340.tar.xz project2-d2f60795927647c09acbeceb32efb8a29314c340.zip | |
All new dynamic transformations and processing and tidyup and stuff
Diffstat (limited to 'project2/commonObjects.cpp')
| -rw-r--r-- | project2/commonObjects.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/project2/commonObjects.cpp b/project2/commonObjects.cpp index 039e105..1d0b13e 100644 --- a/project2/commonObjects.cpp +++ b/project2/commonObjects.cpp @@ -12,14 +12,14 @@ CommonObjects::~CommonObjects() RowSetPtr CommonObjects::getSource(const std::string & name) const { - RowSets::index<bySOName>::type::const_iterator i = rowSets.get<bySOName>().find(name); - if (i != rowSets.get<bySOName>().end()) { - return *i; + RowSets::const_iterator i = rowSets.find(name); + if (i != rowSets.end()) { + return i->second; } throw CommonObjects::DataSourceNotFound(name); } -CommonObjects::DataSources::index<bySOName>::type::const_iterator +CommonObjects::DataSources::const_iterator CommonObjects::loadDataSource(const std::string & name) const { XmlScriptParser xml(ApplicationEngine::getCurrent()->env()->getDatasourceRoot(), name, true); @@ -28,8 +28,8 @@ CommonObjects::loadDataSource(const std::string & name) const loader.supportedStorers.insert(Storer::into(&datasources)); loader.collectAll(xml.get_document()->get_root_node(), false); - DataSources::index<bySOName>::type::const_iterator i = datasources.get<bySOName>().find(name); - if (i == datasources.get<bySOName>().end()) { + DataSources::const_iterator i = datasources.find(name); + if (i == datasources.end()) { throw DataSourceNotFound(name); } return i; |