From f88708797ff91d0eb4280f582f6b51613fb055d7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 28 May 2019 14:49:53 +0200
Subject: [PATCH] STYLE: provide labelPair typedef (a common type) within
Pair.H itself
---
src/OpenFOAM/primitives/Pair/Pair.H | 8 +++++++-
src/OpenFOAM/primitives/Pair/labelPair.H | 7 -------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/OpenFOAM/primitives/Pair/Pair.H b/src/OpenFOAM/primitives/Pair/Pair.H
index 22d2172bfad..db9589d6ace 100644
--- a/src/OpenFOAM/primitives/Pair/Pair.H
+++ b/src/OpenFOAM/primitives/Pair/Pair.H
@@ -50,6 +50,13 @@ See also
namespace Foam
{
+// Forward declarations
+template<class T> class Pair;
+
+// Common pair types
+typedef Pair<label> labelPair; //!< A pair of labels
+
+
/*---------------------------------------------------------------------------*\
Class Pair Declaration
\*---------------------------------------------------------------------------*/
@@ -163,7 +170,6 @@ public:
return seed;
}
};
-
};
diff --git a/src/OpenFOAM/primitives/Pair/labelPair.H b/src/OpenFOAM/primitives/Pair/labelPair.H
index 01e7419951c..f4f81158df0 100644
--- a/src/OpenFOAM/primitives/Pair/labelPair.H
+++ b/src/OpenFOAM/primitives/Pair/labelPair.H
@@ -23,12 +23,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Typedef
- Foam::labelPair
-
-Description
- A pair of labels.
-
Typedef
Foam::labelPairPair
@@ -66,7 +60,6 @@ Description
namespace Foam
{
- typedef Pair<label> labelPair;
typedef Pair<labelPair> labelPairPair;
typedef List<labelPair> labelPairList;
typedef UList<labelPair> labelPairUList;
--
GitLab