From 0933900048d1c3343a42b24aa28c10788941794d Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 10 Oct 2012 15:21:12 +0200
Subject: [PATCH] substituted constant number in constructor declaration with
template parameter NNODES
---
MeshLib/Elements/TemplateHex.h | 2 +-
MeshLib/Elements/TemplateHex.tpp | 2 +-
MeshLib/Elements/TemplatePrism.h | 2 +-
MeshLib/Elements/TemplatePrism.tpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index cf76d11db84..3aab5c49738 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -51,7 +51,7 @@ public:
TemplateHex(Node* nodes[NNODES], unsigned value = 0);
/// Copy constructor
- TemplateHex(const TemplateHex<NNODES,FEMHEXTYPE> &hex);
+ TemplateHex(const TemplateHex &hex);
/// Destructor
virtual ~TemplateHex();
diff --git a/MeshLib/Elements/TemplateHex.tpp b/MeshLib/Elements/TemplateHex.tpp
index 43d4d0b4475..149bd329560 100644
--- a/MeshLib/Elements/TemplateHex.tpp
+++ b/MeshLib/Elements/TemplateHex.tpp
@@ -47,7 +47,7 @@ const unsigned TemplateHex<NNODES,FEMHEXTYPE>::_edge_nodes[12][2] =
};
template <unsigned NNODES, FEMElemType::type FEMHEXTYPE>
-TemplateHex<NNODES,FEMHEXTYPE>::TemplateHex(Node* nodes[8], unsigned value)
+TemplateHex<NNODES,FEMHEXTYPE>::TemplateHex(Node* nodes[NNODES], unsigned value)
: Cell(value)
{
_nodes = nodes;
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index ccc5614f9a7..94e2599fcc9 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -46,7 +46,7 @@ class TemplatePrism : public Cell
{
public:
/// Constructor with an array of mesh nodes.
- TemplatePrism(Node* nodes[6], unsigned value = 0);
+ TemplatePrism(Node* nodes[NNODES], unsigned value = 0);
/// Copy constructor
TemplatePrism(const TemplatePrism &prism);
diff --git a/MeshLib/Elements/TemplatePrism.tpp b/MeshLib/Elements/TemplatePrism.tpp
index c640fb81d83..2118479e7c4 100644
--- a/MeshLib/Elements/TemplatePrism.tpp
+++ b/MeshLib/Elements/TemplatePrism.tpp
@@ -47,7 +47,7 @@ template <unsigned NNODES, FEMElemType::type FEMPRISMTYPE>
const unsigned TemplatePrism<NNODES,FEMPRISMTYPE>::_n_face_nodes[5] = { 3, 4, 4, 4, 3 };
template <unsigned NNODES, FEMElemType::type FEMPRISMTYPE>
-TemplatePrism<NNODES,FEMPRISMTYPE>::TemplatePrism(Node* nodes[6], unsigned value)
+TemplatePrism<NNODES,FEMPRISMTYPE>::TemplatePrism(Node* nodes[NNODES], unsigned value)
: Cell(value)
{
_nodes = nodes;
--
GitLab