From f70a5c4442985fc2136011c55430d45ab741a655 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 16 Oct 2014 17:16:11 +0200
Subject: [PATCH] Replace constexpr with const.
---
MeshLib/Elements/Cell.cpp | 2 +-
MeshLib/Elements/Cell.h | 2 +-
MeshLib/Elements/Face.cpp | 2 +-
MeshLib/Elements/Face.h | 2 +-
NumLib/Fem/ShapeFunction/ShapeHex8.h | 4 ++--
NumLib/Fem/ShapeFunction/ShapeLine2.h | 4 ++--
NumLib/Fem/ShapeFunction/ShapeQuad4.h | 4 ++--
NumLib/Fem/ShapeFunction/ShapeTri3.h | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/MeshLib/Elements/Cell.cpp b/MeshLib/Elements/Cell.cpp
index 357d89784e7..a3cfe0b11f9 100644
--- a/MeshLib/Elements/Cell.cpp
+++ b/MeshLib/Elements/Cell.cpp
@@ -19,7 +19,7 @@
namespace MeshLib {
-constexpr unsigned Cell::dimension;
+const unsigned Cell::dimension;
/*
Cell::Cell(Node** nodes, MeshElemType type, unsigned value)
: Element(nodes, type, value)
diff --git a/MeshLib/Elements/Cell.h b/MeshLib/Elements/Cell.h
index 150a46b0ea5..d64fe479870 100644
--- a/MeshLib/Elements/Cell.h
+++ b/MeshLib/Elements/Cell.h
@@ -27,7 +27,7 @@ class Cell : public Element
{
public:
/// Constant: Dimension of this mesh element
- static constexpr unsigned dimension = 3;
+ static const unsigned dimension = 3;
/// Returns the length, area or volume of a 1D, 2D or 3D element
double getContent() const { return _volume; };
diff --git a/MeshLib/Elements/Face.cpp b/MeshLib/Elements/Face.cpp
index dfd145af46b..ec028db5e1f 100644
--- a/MeshLib/Elements/Face.cpp
+++ b/MeshLib/Elements/Face.cpp
@@ -21,7 +21,7 @@
namespace MeshLib {
-constexpr unsigned Face::dimension;
+const unsigned Face::dimension;
/*
Face::Face(Node** nodes, MeshElemType type, unsigned value)
diff --git a/MeshLib/Elements/Face.h b/MeshLib/Elements/Face.h
index 1bc0b8c452a..70efd57ba69 100644
--- a/MeshLib/Elements/Face.h
+++ b/MeshLib/Elements/Face.h
@@ -32,7 +32,7 @@ class Face : public Element
{
public:
/// Constant: Dimension of this mesh element
- static constexpr unsigned dimension = 2;
+ static const unsigned dimension = 2;
/// Get the area of this 2d element.
virtual double getArea() const { return _area; };
diff --git a/NumLib/Fem/ShapeFunction/ShapeHex8.h b/NumLib/Fem/ShapeFunction/ShapeHex8.h
index a04325c26e4..b2a62c88055 100644
--- a/NumLib/Fem/ShapeFunction/ShapeHex8.h
+++ b/NumLib/Fem/ShapeFunction/ShapeHex8.h
@@ -59,8 +59,8 @@ public:
static void computeGradShapeFunction(const T_X &r, T_N &dN);
using MeshElement = MeshLib::Hex;
- static constexpr std::size_t DIM = MeshElement::dimension;
- static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes;
+ static const std::size_t DIM = MeshElement::dimension;
+ static const std::size_t NPOINTS = MeshElement::n_all_nodes;
};
}
diff --git a/NumLib/Fem/ShapeFunction/ShapeLine2.h b/NumLib/Fem/ShapeFunction/ShapeLine2.h
index 3f7974f2010..9d8cb902e46 100644
--- a/NumLib/Fem/ShapeFunction/ShapeLine2.h
+++ b/NumLib/Fem/ShapeFunction/ShapeLine2.h
@@ -45,8 +45,8 @@ public:
static void computeGradShapeFunction(const T_X &r, T_N &dN);
using MeshElement = MeshLib::Line;
- static constexpr std::size_t DIM = MeshElement::dimension;
- static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes;
+ static const std::size_t DIM = MeshElement::dimension;
+ static const std::size_t NPOINTS = MeshElement::n_all_nodes;
};
}
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad4.h b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
index 5da243edddb..10c14fb4988 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad4.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
@@ -53,8 +53,8 @@ public:
static void computeGradShapeFunction(const T_X &r, T_N &dN);
using MeshElement = MeshLib::Quad;
- static constexpr std::size_t DIM = MeshElement::dimension;
- static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes;
+ static const std::size_t DIM = MeshElement::dimension;
+ static const std::size_t NPOINTS = MeshElement::n_all_nodes;
};
}
diff --git a/NumLib/Fem/ShapeFunction/ShapeTri3.h b/NumLib/Fem/ShapeFunction/ShapeTri3.h
index d5148e3fdd7..74e6e43fd1a 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTri3.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTri3.h
@@ -53,8 +53,8 @@ public:
static void computeGradShapeFunction(const T_X &/*r*/, T_N &dN6);
using MeshElement = MeshLib::Tri;
- static constexpr std::size_t DIM = MeshElement::dimension;
- static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes;
+ static const std::size_t DIM = MeshElement::dimension;
+ static const std::size_t NPOINTS = MeshElement::n_all_nodes;
};
}
--
GitLab