From fe71bbd013fcf3c639f266ea6f6ea96c2cdeb1ac Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 4 Apr 2019 17:40:06 +0200
Subject: [PATCH] STYLE: use constexpr for pTraits rank
---
src/OpenFOAM/primitives/Barycentric/Barycentric.H | 2 +-
src/OpenFOAM/primitives/Barycentric2D/Barycentric2D.H | 2 +-
src/OpenFOAM/primitives/Scalar/Scalar.H | 6 +++---
src/OpenFOAM/primitives/bools/bool/bool.H | 6 +++---
src/OpenFOAM/primitives/ints/int32/int32.H | 6 +++---
src/OpenFOAM/primitives/ints/int64/int64.H | 6 +++---
src/OpenFOAM/primitives/ints/uint32/uint32.H | 6 +++---
src/OpenFOAM/primitives/ints/uint64/uint64.H | 6 +++---
src/OpenFOAM/primitives/quaternion/quaternion.H | 2 +-
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/OpenFOAM/primitives/Barycentric/Barycentric.H b/src/OpenFOAM/primitives/Barycentric/Barycentric.H
index 529d975d131..ae4fe2fb420 100644
--- a/src/OpenFOAM/primitives/Barycentric/Barycentric.H
+++ b/src/OpenFOAM/primitives/Barycentric/Barycentric.H
@@ -63,7 +63,7 @@ public:
// Member constants
//- Rank of Barycentric is 1
- static const direction rank = 1;
+ static constexpr direction rank = 1;
//- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Barycentric2D/Barycentric2D.H b/src/OpenFOAM/primitives/Barycentric2D/Barycentric2D.H
index 49d650da826..b5c46093c98 100644
--- a/src/OpenFOAM/primitives/Barycentric2D/Barycentric2D.H
+++ b/src/OpenFOAM/primitives/Barycentric2D/Barycentric2D.H
@@ -63,7 +63,7 @@ public:
// Member constants
//- Rank of Barycentric2D is 1
- static const direction rank = 1;
+ static constexpr direction rank = 1;
//- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 833f73fe933..9039dbdcb92 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -59,13 +59,13 @@ public:
// Member constants
//- Dimensionality of space
- static const direction dim = 3;
+ static constexpr direction dim = 3;
//- Rank of Scalar is 0
- static const direction rank = 0;
+ static constexpr direction rank = 0;
//- Number of components in Scalar is 1
- static const direction nComponents = 1;
+ static constexpr direction nComponents = 1;
// Static data members
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index 6b6863b0961..6874ca3be5c 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -77,13 +77,13 @@ public:
// Member constants
//- Dimensionality of space
- static const direction dim = 3;
+ static constexpr direction dim = 3;
//- Rank of bool is 0
- static const direction rank = 0;
+ static constexpr direction rank = 0;
//- Number of components in bool is 1
- static const direction nComponents = 1;
+ static constexpr direction nComponents = 1;
// Static data members
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.H b/src/OpenFOAM/primitives/ints/int32/int32.H
index 1840b66b32f..5c4c22f020d 100644
--- a/src/OpenFOAM/primitives/ints/int32/int32.H
+++ b/src/OpenFOAM/primitives/ints/int32/int32.H
@@ -142,13 +142,13 @@ public:
// Member constants
//- Dimensionality of space
- static const direction dim = 3;
+ static constexpr direction dim = 3;
//- Rank of int32_t is 0
- static const direction rank = 0;
+ static constexpr direction rank = 0;
//- Number of components in int32_t is 1
- static const direction nComponents = 1;
+ static constexpr direction nComponents = 1;
// Static data members
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.H b/src/OpenFOAM/primitives/ints/int64/int64.H
index e8c5ece2fc9..4027f863281 100644
--- a/src/OpenFOAM/primitives/ints/int64/int64.H
+++ b/src/OpenFOAM/primitives/ints/int64/int64.H
@@ -143,13 +143,13 @@ public:
// Member constants
//- Dimensionality of space
- static const direction dim = 3;
+ static constexpr direction dim = 3;
//- Rank of int64_t is 0
- static const direction rank = 0;
+ static constexpr direction rank = 0;
//- Number of components in int64_t is 1
- static const direction nComponents = 1;
+ static constexpr direction nComponents = 1;
// Static data members
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.H b/src/OpenFOAM/primitives/ints/uint32/uint32.H
index 81a97323ca9..629c14c3f02 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32.H
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.H
@@ -133,13 +133,13 @@ public:
// Member constants
//- Dimensionality of space
- static const direction dim = 3;
+ static constexpr direction dim = 3;
//- Rank of uint32_t is 0
- static const direction rank = 0;
+ static constexpr direction rank = 0;
//- Number of components in uint32_t is 1
- static const direction nComponents = 1;
+ static constexpr direction nComponents = 1;
// Static data members
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.H b/src/OpenFOAM/primitives/ints/uint64/uint64.H
index dee834635ed..694e9f11587 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64.H
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.H
@@ -141,13 +141,13 @@ public:
// Member constants
//- Dimensionality of space
- static const direction dim = 3;
+ static constexpr direction dim = 3;
//- Rank of uint64_t is 0
- static const direction rank = 0;
+ static constexpr direction rank = 0;
//- Number of components in uint64_t is 1
- static const direction nComponents = 1;
+ static constexpr direction nComponents = 1;
// Static data members
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index ab1e12111c7..95878643ed9 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -110,7 +110,7 @@ public:
// Member constants
//- Rank of quaternion is 1
- static const direction rank = 1;
+ static constexpr direction rank = 1;
// Static data members
--
GitLab