From c52d70cce33a59b537fb76266127b0e1b4786f8a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 10 Jan 2019 07:55:53 +0100 Subject: [PATCH] STYLE: consistent ordering of is_same parameters --- src/OpenFOAM/containers/Lists/List/List.H | 2 +- src/OpenFOAM/containers/Lists/UList/UList.H | 6 +++--- .../lagrangian/vtkCloud/vtkCloudTemplates.C | 9 +++------ .../conversion/vtk/foamVtkLagrangianWriterTemplates.C | 9 +++------ src/meshTools/output/foamVtkIndPatchWriterTemplates.C | 10 +++------- src/meshTools/output/foamVtkSurfaceWriterTemplates.C | 9 +++------ 6 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H index e81b1c906c..6ab194b368 100644 --- a/src/OpenFOAM/containers/Lists/List/List.H +++ b/src/OpenFOAM/containers/Lists/List/List.H @@ -322,7 +322,7 @@ public: // // \return True if value changed. template - typename std::enable_if::value, bool>::type + typename std::enable_if::value, bool>::type inline set(const label i, bool val = true) { if (i < 0) diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H index 0b10f5eae5..3d8302f7f7 100644 --- a/src/OpenFOAM/containers/Lists/UList/UList.H +++ b/src/OpenFOAM/containers/Lists/UList/UList.H @@ -501,7 +501,7 @@ public: // // \return The element value, or false for out-of-range access template - typename std::enable_if::value, bool>::type + typename std::enable_if::value, bool>::type inline test(const label i) const { return (i >= 0 && i < size() && v_[i]); @@ -511,7 +511,7 @@ public: // // \return The element value, or false for out-of-range access template - typename std::enable_if::value, bool>::type + typename std::enable_if::value, bool>::type inline get(const label i) const { return (i >= 0 && i < size_ && v_[i]); @@ -521,7 +521,7 @@ public: // // \return True if value changed and was not out-of-range template - typename std::enable_if::value, bool>::type + typename std::enable_if::value, bool>::type inline unset(const label i) { if (i >= 0 && i < size_ && v_[i]) diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C index aed94728c8..2734645cd1 100644 --- a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C +++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,15 +40,12 @@ Foam::wordList Foam::functionObjects::vtkCloud::writeFields static_assert ( ( - std::is_same::cmptType,label>::value + std::is_same::cmptType>::value || std::is_floating_point::cmptType>::value ), "Label and Floating-point vector space only" ); - const bool isLabel = - std::is_same::cmptType,label>::value; - // Other integral types (eg, bool etc) would need cast/convert to label. // Similarly for labelVector etc. @@ -70,7 +67,7 @@ Foam::wordList Foam::functionObjects::vtkCloud::writeFields if (Pstream::master()) { - if (isLabel) + if (std::is_same::cmptType>::value) { const uint64_t payLoad = vtk::sizeofData(nTotParcels); diff --git a/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriterTemplates.C b/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriterTemplates.C index fda8ea7254..105f127dd0 100644 --- a/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriterTemplates.C +++ b/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriterTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ void Foam::vtk::lagrangianWriter::write(const IOField& field) static_assert ( ( - std::is_same::cmptType,label>::value + std::is_same::cmptType>::value || std::is_floating_point::cmptType>::value ), "Label and Floating-point vector space only" @@ -72,9 +72,6 @@ void Foam::vtk::lagrangianWriter::write(const IOField& field) // } // } - const bool isLabel = - std::is_same::cmptType(), label>::value; - const direction nCmpt(pTraits::nComponents); @@ -89,7 +86,7 @@ void Foam::vtk::lagrangianWriter::write(const IOField& field) { // Non-legacy - if (isLabel) + if (std::is_same::cmptType>::value) { const uint64_t payLoad = vtk::sizeofData(nVals); diff --git a/src/meshTools/output/foamVtkIndPatchWriterTemplates.C b/src/meshTools/output/foamVtkIndPatchWriterTemplates.C index b0819afc18..9db4cc9fde 100644 --- a/src/meshTools/output/foamVtkIndPatchWriterTemplates.C +++ b/src/meshTools/output/foamVtkIndPatchWriterTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,16 +53,12 @@ void Foam::vtk::indirectPatchWriter::write static_assert ( ( - std::is_same::cmptType,label>::value + std::is_same::cmptType>::value || std::is_floating_point::cmptType>::value ), "Label and Floating-point vector space only" ); - const bool isLabel = - std::is_same::cmptType(), label>::value; - - const direction nCmpt(pTraits::nComponents); label nValues = field.size(); @@ -78,7 +74,7 @@ void Foam::vtk::indirectPatchWriter::write if (format_) { - if (isLabel) + if (std::is_same::cmptType>::value) { if (legacy()) { diff --git a/src/meshTools/output/foamVtkSurfaceWriterTemplates.C b/src/meshTools/output/foamVtkSurfaceWriterTemplates.C index ace78f733f..3c9bc0c582 100644 --- a/src/meshTools/output/foamVtkSurfaceWriterTemplates.C +++ b/src/meshTools/output/foamVtkSurfaceWriterTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,15 +53,12 @@ void Foam::vtk::surfaceWriter::write static_assert ( ( - std::is_same::cmptType,label>::value + std::is_same::cmptType>::value || std::is_floating_point::cmptType>::value ), "Label and Floating-point vector space only" ); - const bool isLabel = - std::is_same::cmptType(), label>::value; - const direction nCmpt(pTraits::nComponents); @@ -78,7 +75,7 @@ void Foam::vtk::surfaceWriter::write if (format_) { - if (isLabel) + if (std::is_same::cmptType>::value) { if (legacy()) {