From 607b1aa944ed647465ae8d1ea564dd543b76aebe Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Mon, 21 Mar 2016 11:03:23 +0000 Subject: [PATCH] Remove typename and this-> from template specialisation: gcc-4.4.6 --- .../tensorExtendedBlockLduMatrix.C | 12 +++--- .../BlockLduMatrix/scalarBlockLduMatrix.C | 38 +++++++++---------- .../sphericalTensorBlockLduMatrix.C | 10 ++--- .../BlockLduMatrix/symmTensorBlockLduMatrix.C | 10 ++--- .../BlockLduMatrix/tensorBlockLduMatrix.C | 10 ++--- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/extendedBlockLduMatrix/tensorExtendedBlockLduMatrix.C b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/extendedBlockLduMatrix/tensorExtendedBlockLduMatrix.C index dd7e768df..65945f84c 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/extendedBlockLduMatrix/tensorExtendedBlockLduMatrix.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/extendedBlockLduMatrix/tensorExtendedBlockLduMatrix.C @@ -72,7 +72,7 @@ void Foam::extendedBlockLduMatrix::mapOffDiagCoeffs if (upper.activeType() == blockCoeffBase::SCALAR) { // Helper type definition - typedef typename CoeffField::scalarTypeField + typedef CoeffField::scalarTypeField activeType; // Get references to fields @@ -89,7 +89,7 @@ void Foam::extendedBlockLduMatrix::mapOffDiagCoeffs else if (upper.activeType() == blockCoeffBase::LINEAR) { // Helper type definition - typedef typename CoeffField::linearTypeField + typedef CoeffField::linearTypeField activeType; // Get references to fields @@ -131,7 +131,7 @@ void Foam::extendedBlockLduMatrix::mapOffDiagCoeffs if (lower.activeType() == blockCoeffBase::SCALAR) { // Helper type definition - typedef typename CoeffField::scalarTypeField + typedef CoeffField::scalarTypeField activeType; // Get references to fields @@ -148,7 +148,7 @@ void Foam::extendedBlockLduMatrix::mapOffDiagCoeffs else if (lower.activeType() == blockCoeffBase::LINEAR) { // Helper type definition - typedef typename CoeffField::linearTypeField + typedef CoeffField::linearTypeField activeType; // Get references to fields @@ -199,7 +199,7 @@ void Foam::extendedBlockLduMatrix::mapOffDiagCoeffs if (upper.activeType() == blockCoeffBase::SCALAR) { // Helper type definition - typedef typename CoeffField::scalarTypeField activeType; + typedef CoeffField::scalarTypeField activeType; // Get references to fields const activeType& activeUpper = upper.asScalar(); @@ -218,7 +218,7 @@ void Foam::extendedBlockLduMatrix::mapOffDiagCoeffs else if (upper.activeType() == blockCoeffBase::LINEAR) { // Helper type definition - typedef typename CoeffField::linearTypeField activeType; + typedef CoeffField::linearTypeField activeType; // Get references to fields const activeType& activeUpper = upper.asLinear(); diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/scalarBlockLduMatrix.C b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/scalarBlockLduMatrix.C index e0124bb15..1ec2cd463 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/scalarBlockLduMatrix.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/scalarBlockLduMatrix.C @@ -34,14 +34,14 @@ namespace Foam template<> void BlockLduMatrix::sumDiag() { - scalarField& activeDiag = this->diag(); + scalarField& activeDiag = diag(); const unallocLabelList& l = lduAddr().lowerAddr(); const unallocLabelList& u = lduAddr().upperAddr(); if (symmetric()) { - const scalarField& activeUpper = this->upper(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { @@ -51,8 +51,8 @@ void BlockLduMatrix::sumDiag() } else if (asymmetric()) { - const scalarField& activeLower = this->lower(); - const scalarField& activeUpper = this->upper(); + const scalarField& activeLower = lower(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { @@ -72,14 +72,14 @@ void BlockLduMatrix::sumDiag() template<> void BlockLduMatrix::negSumDiag() { - scalarField& activeDiag = this->diag(); + scalarField& activeDiag = diag(); const unallocLabelList& l = lduAddr().lowerAddr(); const unallocLabelList& u = lduAddr().upperAddr(); if (symmetric()) { - const scalarField& activeUpper = this->upper(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { @@ -89,8 +89,8 @@ void BlockLduMatrix::negSumDiag() } else if (asymmetric()) { - const scalarField& activeLower = this->lower(); - const scalarField& activeUpper = this->upper(); + const scalarField& activeLower = lower(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { @@ -111,14 +111,14 @@ template<> void BlockLduMatrix::check() const { // Copy the diagonal - scalarField activeDiagCopy = this->diag(); + scalarField activeDiagCopy = diag(); const unallocLabelList& l = lduAddr().lowerAddr(); const unallocLabelList& u = lduAddr().upperAddr(); if (symmetric()) { - const scalarField& activeUpper = this->upper(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { @@ -130,13 +130,13 @@ void BlockLduMatrix::check() const << "Symmetric matrix: raw matrix difference: " << sum(mag(activeDiagCopy)) << " scaled: " - << sum(mag(activeDiagCopy))/sum(mag(this->diag())) + << sum(mag(activeDiagCopy))/sum(mag(diag())) << endl; } else if (asymmetric()) { - const scalarField& activeLower = this->lower(); - const scalarField& activeUpper = this->upper(); + const scalarField& activeLower = lower(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { @@ -148,7 +148,7 @@ void BlockLduMatrix::check() const << "Asymmetric matrix: raw matrix difference: " << sum(mag(activeDiagCopy)) << " scaled: " - << sum(mag(activeDiagCopy))/sum(mag(this->diag())) + << sum(mag(activeDiagCopy))/sum(mag(diag())) << endl; } else @@ -167,9 +167,9 @@ void BlockLduMatrix::relax const scalar alpha ) { - scalarField& activeDiag = this->diag(); + scalarField& activeDiag = diag(); - scalarField activeDiagOld = this->diag(); + scalarField activeDiagOld = diag(); const unallocLabelList& l = lduAddr().lowerAddr(); const unallocLabelList& u = lduAddr().upperAddr(); @@ -178,7 +178,7 @@ void BlockLduMatrix::relax if (symmetric()) { - const scalarField& activeUpper = this->upper(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { @@ -188,8 +188,8 @@ void BlockLduMatrix::relax } else if (asymmetric()) { - const scalarField& activeLower = this->lower(); - const scalarField& activeUpper = this->upper(); + const scalarField& activeLower = lower(); + const scalarField& activeUpper = upper(); for (register label coeffI = 0; coeffI < l.size(); coeffI++) { diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/sphericalTensorBlockLduMatrix.C b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/sphericalTensorBlockLduMatrix.C index 69ef8d63d..40c2f4eec 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/sphericalTensorBlockLduMatrix.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/sphericalTensorBlockLduMatrix.C @@ -37,7 +37,7 @@ template<> void Foam::BlockLduMatrix::sumDiag() { // Decoupled version - this->decoupledSumDiag(); + decoupledSumDiag(); } @@ -45,7 +45,7 @@ template<> void Foam::BlockLduMatrix::negSumDiag() { // Decoupled version - this->decoupledNegSumDiag(); + decoupledNegSumDiag(); } @@ -53,7 +53,7 @@ template<> void Foam::BlockLduMatrix::check() const { // Decoupled version - this->decoupledCheck(); + decoupledCheck(); } @@ -66,7 +66,7 @@ void Foam::BlockLduMatrix::relax ) { // Decoupled version - this->decoupledRelax(x, b, alpha); + decoupledRelax(x, b, alpha); } @@ -77,7 +77,7 @@ void Foam::BlockLduMatrix::operator*= ) { // Decoupled version - this->decoupledMultEqOp(sf); + decoupledMultEqOp(sf); } diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/symmTensorBlockLduMatrix.C b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/symmTensorBlockLduMatrix.C index 17a6a4569..e0ca3c881 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/symmTensorBlockLduMatrix.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/symmTensorBlockLduMatrix.C @@ -38,7 +38,7 @@ template<> void Foam::BlockLduMatrix::sumDiag() { // Decoupled version - this->decoupledSumDiag(); + decoupledSumDiag(); } @@ -46,7 +46,7 @@ template<> void Foam::BlockLduMatrix::negSumDiag() { // Decoupled version - this->decoupledNegSumDiag(); + decoupledNegSumDiag(); } @@ -54,7 +54,7 @@ template<> void Foam::BlockLduMatrix::check() const { // Decoupled version - this->decoupledCheck(); + decoupledCheck(); } @@ -67,7 +67,7 @@ void Foam::BlockLduMatrix::relax ) { // Decoupled version - this->decoupledRelax(x, b, alpha); + decoupledRelax(x, b, alpha); } @@ -75,7 +75,7 @@ template<> void Foam::BlockLduMatrix::operator*=(const scalarField& sf) { // Decoupled version - this->decoupledMultEqOp(sf); + decoupledMultEqOp(sf); } diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/tensorBlockLduMatrix.C b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/tensorBlockLduMatrix.C index 3fcc1a8c8..da2d990b3 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/tensorBlockLduMatrix.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/tensorBlockLduMatrix.C @@ -37,7 +37,7 @@ template<> void Foam::BlockLduMatrix::sumDiag() { // Decoupled version - this->decoupledSumDiag(); + decoupledSumDiag(); } @@ -45,7 +45,7 @@ template<> void Foam::BlockLduMatrix::negSumDiag() { // Decoupled version - this->decoupledNegSumDiag(); + decoupledNegSumDiag(); } @@ -53,7 +53,7 @@ template<> void Foam::BlockLduMatrix::check() const { // Decoupled version - this->decoupledCheck(); + decoupledCheck(); } @@ -66,7 +66,7 @@ void Foam::BlockLduMatrix::relax ) { // Decoupled version - this->decoupledRelax(x, b, alpha); + decoupledRelax(x, b, alpha); } @@ -74,7 +74,7 @@ template<> void Foam::BlockLduMatrix::operator*=(const scalarField& sf) { // Decoupled version - this->decoupledMultEqOp(sf); + decoupledMultEqOp(sf); }