From 092e7acad90ce68b963e96c773357c08c5929110 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 12 Jan 2016 14:28:47 +0100
Subject: [PATCH] Update ProjectData for tmpl-ed Process.
---
Applications/ApplicationsLib/ProjectData.cpp | 2 +-
Applications/ApplicationsLib/ProjectData.h | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index 25bd20b0fff..c6846bb9aed 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -84,7 +84,7 @@ ProjectData::~ProjectData()
{
delete _geoObjects;
- for(ProcessLib::Process* p : _processes)
+ for(ProcessLib::Process<GlobalSetupType>* p : _processes)
delete p;
for (MeshLib::Mesh* m : _mesh_vec)
diff --git a/Applications/ApplicationsLib/ProjectData.h b/Applications/ApplicationsLib/ProjectData.h
index 2fbf73f0760..c1c6b917f61 100644
--- a/Applications/ApplicationsLib/ProjectData.h
+++ b/Applications/ApplicationsLib/ProjectData.h
@@ -110,24 +110,24 @@ public:
/// Iterator access for processes.
/// Provides read access to the process container.
- std::vector<ProcessLib::Process*>::const_iterator
+ std::vector<ProcessLib::Process<GlobalSetupType>*>::const_iterator
processesBegin() const
{
return _processes.begin();
}
- std::vector<ProcessLib::Process*>::iterator
+ std::vector<ProcessLib::Process<GlobalSetupType>*>::iterator
processesBegin()
{
return _processes.begin();
}
/// Iterator access for processes as in processesBegin().
- std::vector<ProcessLib::Process*>::const_iterator
+ std::vector<ProcessLib::Process<GlobalSetupType>*>::const_iterator
processesEnd() const
{
return _processes.end();
}
- std::vector<ProcessLib::Process*>::iterator
+ std::vector<ProcessLib::Process<GlobalSetupType>*>::iterator
processesEnd()
{
return _processes.end();
@@ -187,7 +187,7 @@ private:
private:
GeoLib::GEOObjects *_geoObjects = new GeoLib::GEOObjects();
std::vector<MeshLib::Mesh*> _mesh_vec;
- std::vector<ProcessLib::Process*> _processes;
+ std::vector<ProcessLib::Process<GlobalSetupType>*> _processes;
std::vector<ProcessLib::ProcessVariable> _process_variables;
/// Buffer for each process' config used in the process building function.
--
GitLab