From d8421ce16f77e1fa9c7ce840f115055d93e8f34b Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 29 Aug 2016 18:26:35 +0200
Subject: [PATCH] [AppL] Change processesBegin/End to getProcesses.
Only const version for now, which is sufficient.
---
Applications/ApplicationsLib/ProjectData.h | 22 +++-------------------
Applications/CLI/ogs.cpp | 5 ++---
2 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/Applications/ApplicationsLib/ProjectData.h b/Applications/ApplicationsLib/ProjectData.h
index c8e98f78e26..8bed77758b1 100644
--- a/Applications/ApplicationsLib/ProjectData.h
+++ b/Applications/ApplicationsLib/ProjectData.h
@@ -102,27 +102,11 @@ public:
// Process interface
//
- /// Iterator access for processes.
/// Provides read access to the process container.
- std::map<std::string, std::unique_ptr<ProcessLib::Process>>::const_iterator
- processesBegin() const
+ std::map<std::string, std::unique_ptr<ProcessLib::Process>> const&
+ getProcesses() const
{
- return _processes.begin();
- }
- std::map<std::string, std::unique_ptr<ProcessLib::Process>>::iterator processesBegin()
- {
- return _processes.begin();
- }
-
- /// Iterator access for processes as in processesBegin().
- std::map<std::string, std::unique_ptr<ProcessLib::Process>>::const_iterator
- processesEnd() const
- {
- return _processes.end();
- }
- std::map<std::string, std::unique_ptr<ProcessLib::Process>>::iterator processesEnd()
- {
- return _processes.end();
+ return _processes;
}
TimeLoop& getTimeLoop() { return *_time_loop; }
diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp
index 1c51f7dd876..e6a9087ba2c 100644
--- a/Applications/CLI/ogs.cpp
+++ b/Applications/CLI/ogs.cpp
@@ -111,10 +111,9 @@ int main(int argc, char *argv[])
BaseLib::ConfigTree::assertNoSwallowedErrors();
INFO("Initialize processes.");
- for (auto p_it = project.processesBegin();
- p_it != project.processesEnd(); ++p_it)
+ for (auto& p : project.getProcesses())
{
- p_it->second->initialize();
+ p.second->initialize();
}
BaseLib::ConfigTree::assertNoSwallowedErrors();
--
GitLab