From 5c973ce760055c430f332ad8f17391df546b122c Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Mon, 7 May 2012 11:25:10 +0200
Subject: [PATCH] [MeshLib::Element] - fixed some warnings regarding the
sequence of attributes in header file and initializer list in constructor
---
MeshLib/Elements/Element.cpp | 6 +++---
MeshLib/Elements/Element.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index 66cb6195a03..243cedd9746 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -13,12 +13,12 @@
namespace MeshLib {
Element::Element(Node** nodes, MshElemType::type type, size_t value)
- : _nodes(nodes), _type(type), _value(value)
+ : _type(type), _nodes(nodes), _value(value)
{
}
Element::Element(MshElemType::type type, size_t value)
- : _type(type), _value(value)
+ : _type(type), _nodes(NULL), _value(value)
{
}
@@ -33,7 +33,7 @@ const Node* Element::getNode(size_t i) const
return _nodes[i];
}
-size_t Element::getNodeIndex(size_t i) const
+size_t Element::getNodeIndex(size_t i) const
{
assert(i<getNNodes() && "Error in MeshLib::Element - Index does not exist.");
return _nodes[i]->getID();
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index e84058b1255..ddb3b07f118 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -60,8 +60,8 @@ protected:
Node* getNode(size_t i);
MshElemType::type _type;
- size_t _value;
Node** _nodes;
+ size_t _value;
std::vector<Element*> _neighbors;
private:
--
GitLab