From 20e1dabed20b8419e759f1c442cce60a5843bed2 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Thu, 13 May 2021 21:32:42 +0200
Subject: [PATCH] [MaL] Make TemplatePoint::_x a private member.
Using (const) access functions in two cases of direct
member access.
---
Applications/FileIO/Gmsh/GMSHPoint.cpp | 4 ++--
MathLib/TemplatePoint.h | 2 +-
MeshLib/Node.cpp | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Applications/FileIO/Gmsh/GMSHPoint.cpp b/Applications/FileIO/Gmsh/GMSHPoint.cpp
index e128e0ffac8..8da809a4e9b 100644
--- a/Applications/FileIO/Gmsh/GMSHPoint.cpp
+++ b/Applications/FileIO/Gmsh/GMSHPoint.cpp
@@ -25,8 +25,8 @@ GMSHPoint::GMSHPoint(GeoLib::Point const& pnt, std::size_t id,
void GMSHPoint::write(std::ostream& os) const
{
- os << "Point(" << getID() << ") = {" << _x[0] << ", " << _x[1] << ", "
- << _x[2];
+ os << "Point(" << getID() << ") = {" << (*this)[0] << ", " << (*this)[1]
+ << ", " << (*this)[2];
if (fabs(_mesh_density) > std::numeric_limits<double>::epsilon())
{
os << ", " << _mesh_density << "};";
diff --git a/MathLib/TemplatePoint.h b/MathLib/TemplatePoint.h
index 3b0d4b9935d..e4b971cfa90 100644
--- a/MathLib/TemplatePoint.h
+++ b/MathLib/TemplatePoint.h
@@ -95,7 +95,7 @@ public:
std::copy(std::istream_iterator<T>(is), std::istream_iterator<T>(), _x.begin());
}
-protected:
+private:
std::array<T, DIM> _x;
};
diff --git a/MeshLib/Node.cpp b/MeshLib/Node.cpp
index df1d730dde4..1795cff0315 100644
--- a/MeshLib/Node.cpp
+++ b/MeshLib/Node.cpp
@@ -34,13 +34,13 @@ Node::Node(double x, double y, double z, std::size_t id)
{
}
-Node::Node(const Node& node) : MathLib::Point3dWithID(node._x, node.getID()) {}
+Node::Node(const Node& node) : MathLib::Point3dWithID(node, node.getID()) {}
void Node::updateCoordinates(double x, double y, double z)
{
- _x[0] = x;
- _x[1] = y;
- _x[2] = z;
+ (*this)[0] = x;
+ (*this)[1] = y;
+ (*this)[2] = z;
const std::size_t nElements(this->_elements.size());
for (std::size_t i = 0; i < nElements; i++)
--
GitLab