From 82211112452cfd6da3d8e9e586e14c5d01856b0f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2017 23:59:11 +0200
Subject: [PATCH] STYLE: pass legacy nCmpt as int
---
src/fileFormats/vtk/output/foamVtkOutput.H | 4 ++--
src/fileFormats/vtk/output/foamVtkOutputI.H | 4 ++--
src/fileFormats/vtk/output/foamVtkOutputTemplates.C | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index 4dd909219d9..c3632a11913 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -199,7 +199,7 @@ namespace legacy
(
std::ostream& os,
const word& name,
- const label nCmpt,
+ const int nCmpt,
const label nEntries
);
@@ -208,7 +208,7 @@ namespace legacy
(
std::ostream& os,
const word& name,
- const label nCmpt,
+ const int nCmpt,
const label nEntries
);
diff --git a/src/fileFormats/vtk/output/foamVtkOutputI.H b/src/fileFormats/vtk/output/foamVtkOutputI.H
index 9618bae2abf..b7717ea66d3 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputI.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputI.H
@@ -123,7 +123,7 @@ inline void Foam::vtk::legacy::floatField
(
std::ostream& os,
const word& fieldName,
- const label nCmpt,
+ const int nCmpt,
const label nEntries
)
{
@@ -135,7 +135,7 @@ inline void Foam::vtk::legacy::intField
(
std::ostream& os,
const word& fieldName,
- const label nCmpt,
+ const int nCmpt,
const label nEntries
)
{
diff --git a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
index a60d01e52e7..f28d458378e 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
@@ -32,7 +32,8 @@ inline void Foam::vtk::write
const Type& val
)
{
- for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
+ const direction nCmpt = pTraits<Type>::nComponents;
+ for (direction cmpt=0; cmpt < nCmpt; ++cmpt)
{
fmt.write(component(val, cmpt));
}
--
GitLab