From b0918eb66799a280a0caaf2d42c77b75576e7a89 Mon Sep 17 00:00:00 2001
From: Florian Zill <florian.zill@ufz.de>
Date: Mon, 3 Feb 2020 16:47:49 +0100
Subject: [PATCH] [ML/MPL] changed media map to shared pointer
---
MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp | 2 +-
MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h | 2 +-
MaterialLib/MPL/MaterialSpatialDistributionMap.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp b/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp
index 95afd5115c8..f4e31dc2700 100644
--- a/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp
+++ b/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp
@@ -16,7 +16,7 @@ namespace MaterialPropertyLib
{
std::unique_ptr<MaterialSpatialDistributionMap>
createMaterialSpatialDistributionMap(
- std::map<int, std::unique_ptr<Medium>> const& media,
+ std::map<int, std::shared_ptr<Medium>> const& media,
MeshLib::Mesh const& mesh)
{
auto const material_ids = materialIDs(mesh);
diff --git a/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h b/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h
index 8d60b9c5f6d..2062e86fe58 100644
--- a/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h
+++ b/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h
@@ -26,6 +26,6 @@ class Medium;
std::unique_ptr<MaterialSpatialDistributionMap>
createMaterialSpatialDistributionMap(
- std::map<int, std::unique_ptr<Medium>> const& media,
+ std::map<int, std::shared_ptr<Medium>> const& media,
MeshLib::Mesh const& mesh);
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/MaterialSpatialDistributionMap.h b/MaterialLib/MPL/MaterialSpatialDistributionMap.h
index 06c86509e76..f51f94a0d3d 100644
--- a/MaterialLib/MPL/MaterialSpatialDistributionMap.h
+++ b/MaterialLib/MPL/MaterialSpatialDistributionMap.h
@@ -29,7 +29,7 @@ class MaterialSpatialDistributionMap
{
public:
MaterialSpatialDistributionMap(
- std::map<int, std::unique_ptr<Medium>> const& media,
+ std::map<int, std::shared_ptr<Medium>> const& media,
MeshLib::PropertyVector<int> const* const material_ids)
: _media(media), _material_ids(material_ids)
{
@@ -38,7 +38,7 @@ public:
Medium* getMedium(std::size_t element_id);
private:
- std::map<int, std::unique_ptr<Medium>> const& _media;
+ std::map<int, std::shared_ptr<Medium>> const& _media;
MeshLib::PropertyVector<int> const* const _material_ids;
};
} // namespace MaterialPropertyLib
--
GitLab