From c4f7c0df62d4d2009a2351f173edb5fcdaa635dc Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <github@naumov.de> Date: Sat, 8 Oct 2016 14:16:49 +0200 Subject: [PATCH] [MeL] Update for ptr version of getPropertyVec. --- MeshLib/Mesh.cpp | 6 ++---- MeshLib/Mesh.h | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp index d205f39fbf3..8b043cf8ae0 100644 --- a/MeshLib/Mesh.cpp +++ b/MeshLib/Mesh.cpp @@ -257,10 +257,8 @@ void scaleMeshPropertyVector(MeshLib::Mesh & mesh, std::string const& property_name, double factor) { - boost::optional<MeshLib::PropertyVector<double> &> pv( - mesh.getProperties().getPropertyVector<double>(property_name)); - - for (auto & v : *pv) + for (auto& v : + *mesh.getProperties().getPropertyVector<double>(property_name)) v *= factor; } diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h index 0a4e2159010..0dbbc93cf0f 100644 --- a/MeshLib/Mesh.h +++ b/MeshLib/Mesh.h @@ -215,9 +215,8 @@ void addPropertyToMesh(MeshLib::Mesh& mesh, std::string const& name, mesh.getNumberOfElements(), values.size() / number_of_components); - boost::optional<MeshLib::PropertyVector<T>&> property( - mesh.getProperties().createNewPropertyVector<T>(name, item_type, - number_of_components)); + auto* const property = mesh.getProperties().createNewPropertyVector<T>( + name, item_type, number_of_components); if (!property) { OGS_FATAL("Error while creating PropertyVector \"%s\".", name.c_str()); -- GitLab