From 302c5ae759e39bb06113e82adeb07fa2599d81be Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 7 Jun 2012 09:23:05 +0100
Subject: [PATCH 1/4] ENH: Removed unused variable

---
 src/Pstream/mpi/UPstream.C | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 3123aa4787..9438b1ca9a 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -581,7 +581,6 @@ void Foam::UPstream::waitRequest(const label i)
             << Foam::abort(FatalError);
     }
 
-    int flag;
     if
     (
         MPI_Wait

From 661e0e948a3f050dd0c02f0463084d58c5e61bf6 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 7 Jun 2012 11:10:18 +0100
Subject: [PATCH 2/4] BUG: AC3D reader - corrected conversion of label to
 string for output message

---
 src/triSurface/triSurface/interfaces/AC3D/readAC.C | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
index 27fbcf9dc4..f8d6c1dd60 100644
--- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
@@ -174,7 +174,13 @@ bool triSurface::readAC(const fileName& ACfileName)
 
     for (label patchI = 0; patchI < nPatches; patchI++)
     {
-        readUpto("OBJECT", ACfile, args, " while reading patch " + patchI);
+        readUpto
+        (
+            "OBJECT",
+            ACfile,
+            args,
+            " while reading patch " + Foam::name(patchI)
+        );
 
         // Object global values
         string patchName = string("patch") + name(patchI);

From 2b48e78cc5374c92c4b8f1ce8af486434c2286a7 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 7 Jun 2012 11:11:21 +0100
Subject: [PATCH 3/4] STYLE: Updated copyright year

---
 src/triSurface/triSurface/interfaces/AC3D/readAC.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
index f8d6c1dd60..2e122c936c 100644
--- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 74d014f1031c7ca248643d833a18a48fb3930df8 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 7 Jun 2012 11:18:02 +0100
Subject: [PATCH 4/4] ENH: Moved NamedEnum instantiation inside of Foam
 namespace

---
 src/fileFormats/vtk/vtkUnstructuredReader.C | 75 +++++++++++----------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 5bb8b8d8f9..cec718d3af 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -34,47 +34,50 @@ License
 
 defineTypeNameAndDebug(Foam::vtkUnstructuredReader, 0);
 
-template<>
-const char*
-Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>::names[] =
+namespace Foam
 {
-    "int",
-    "unsigned_int",
-    "long",
-    "unsigned_long",
-    "float",
-    "double",
-    "string",
-    "vtkIdType"
-};
-const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>
-Foam::vtkUnstructuredReader::vtkDataTypeNames;
+    template<>
+    const char*
+    NamedEnum<vtkUnstructuredReader::vtkDataType, 8>::names[] =
+    {
+        "int",
+        "unsigned_int",
+        "long",
+        "unsigned_long",
+        "float",
+        "double",
+        "string",
+        "vtkIdType"
+    };
+    const NamedEnum<vtkUnstructuredReader::vtkDataType, 8>
+    vtkUnstructuredReader::vtkDataTypeNames;
 
 
-template<>
-const char*
-Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataSetType, 3>::names[] =
-{
-    "FIELD",
-    "SCALARS",
-    "VECTORS"
-};
-const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataSetType, 3>
-Foam::vtkUnstructuredReader::vtkDataSetTypeNames;
+    template<>
+    const char*
+    NamedEnum<vtkUnstructuredReader::vtkDataSetType, 3>::names[] =
+    {
+        "FIELD",
+        "SCALARS",
+        "VECTORS"
+    };
+    const NamedEnum<vtkUnstructuredReader::vtkDataSetType, 3>
+    vtkUnstructuredReader::vtkDataSetTypeNames;
 
 
-template<>
-const char*
-Foam::NamedEnum<Foam::vtkUnstructuredReader::parseMode, 5>::names[] =
-{
-    "NOMODE",
-    "UNSTRUCTURED_GRID",
-    "POLYDATA",
-    "CELL_DATA",
-    "POINT_DATA"
-};
-const Foam::NamedEnum<Foam::vtkUnstructuredReader::parseMode, 5>
-Foam::vtkUnstructuredReader::parseModeNames;
+    template<>
+    const char*
+    NamedEnum<vtkUnstructuredReader::parseMode, 5>::names[] =
+    {
+        "NOMODE",
+        "UNSTRUCTURED_GRID",
+        "POLYDATA",
+        "CELL_DATA",
+        "POINT_DATA"
+    };
+    const NamedEnum<vtkUnstructuredReader::parseMode, 5>
+    vtkUnstructuredReader::parseModeNames;
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //