From 7243704068ddef3c92f02c07222f565e648940c8 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 7 Jan 2011 14:49:25 +0000 Subject: [PATCH] STYLE: labelPairList defined in labelPair.H --- .../meshes/polyMesh/globalMeshData/globalMeshData.H | 5 +---- .../polyMesh/polyBoundaryMesh/polyBoundaryMesh.H | 3 +-- src/OpenFOAM/primitives/Pair/labelPair.H | 11 +++++++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H index 09935e22b1..2c06047c1e 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -126,9 +126,6 @@ class globalMeshData }; - typedef List labelPairList; - - // Private data //- Reference to mesh diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H index 755e649e07..95a7dca579 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,6 @@ SourceFiles namespace Foam { -typedef List labelPairList; class polyMesh; // Forward declaration of friend functions and operators diff --git a/src/OpenFOAM/primitives/Pair/labelPair.H b/src/OpenFOAM/primitives/Pair/labelPair.H index be3982483b..246cd5cd48 100644 --- a/src/OpenFOAM/primitives/Pair/labelPair.H +++ b/src/OpenFOAM/primitives/Pair/labelPair.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,19 +27,26 @@ Typedef Description Label pair +Typedef + Foam::labelPairList + +Description + List of labelPairs + \*---------------------------------------------------------------------------*/ #ifndef labelPair_H #define labelPair_H -#include "label.H" #include "Pair.H" +#include "List.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { typedef Pair