From 1945ec9c93714747ee93eb4d621e584509de5008 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 11 Feb 2019 13:52:00 +0100
Subject: [PATCH] [MeL] Element::getNodeIndex returns size_t now.
---
Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp | 2 +-
MeshLib/Elements/Element.cpp | 4 ++--
MeshLib/Elements/Element.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
index 99054b77d00..bf2d608b0ab 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
+++ b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
@@ -691,7 +691,7 @@ void FEFLOWMeshInterface::setMaterialIDs(
for (std::size_t i = 0; i < vec_elements.size(); i++)
{
MeshLib::Element* e = vec_elements[i];
- unsigned e_min_nodeID = std::numeric_limits<unsigned>::max();
+ std::size_t e_min_nodeID = std::numeric_limits<std::size_t>::max();
for (std::size_t j = 0; j < e->getNumberOfBaseNodes(); j++)
e_min_nodeID = std::min(e_min_nodeID, e->getNodeIndex(j));
std::size_t layer_id = e_min_nodeID / no_nodes_per_layer;
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index 385547b4ac4..5c9061bee49 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -161,7 +161,7 @@ void Element::setNode(unsigned idx, Node* node)
_nodes[idx] = node;
}
-unsigned Element::getNodeIndex(unsigned i) const
+std::size_t Element::getNodeIndex(unsigned i) const
{
#ifndef NDEBUG
if (i<getNumberOfNodes())
@@ -169,7 +169,7 @@ unsigned Element::getNodeIndex(unsigned i) const
return _nodes[i]->getID();
#ifndef NDEBUG
ERR("Error in MeshLib::Element::getNodeIndex() - Index does not exist.");
- return std::numeric_limits<unsigned>::max();
+ return std::numeric_limits<std::size_t>::max();
#endif
}
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index 64db3a1af5c..e6ffd9b6b43 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -120,7 +120,7 @@ public:
* @return the global index or std::numeric_limits<unsigned>::max()
* @sa Element::getNode()
*/
- unsigned getNodeIndex(unsigned i) const;
+ std::size_t getNodeIndex(unsigned i) const;
/**
* Get the type of the mesh element in geometric context (as a MeshElemType-enum).
--
GitLab