From 5a18de14fb82226aed791028a6a8cbb6b376ebcd Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 17 Sep 2013 16:05:04 +0100 Subject: [PATCH] Icc compiler: template statics initialisation --- src/OpenFOAM/containers/Lists/FixedList/FixedList.C | 3 +-- src/OpenFOAM/containers/Lists/List/List.C | 2 +- src/OpenFOAM/containers/Lists/UList/UListI.H | 2 +- src/OpenFOAM/fields/Fields/Field/Field.C | 3 ++- src/OpenFOAM/matrices/Matrix/Matrix.C | 4 ++-- src/OpenFOAM/memory/Xfer/XferI.H | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C index 20a5697b5..2fd3112a8 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C @@ -30,8 +30,7 @@ License // * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * // template -const Foam::FixedList Foam::FixedList::zero = - Foam::FixedList(); +const Foam::FixedList Foam::FixedList::zero; // * * * * * * * * * * * * * * STL Member Functions * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C index 7dd52c35b..0ef350288 100644 --- a/src/OpenFOAM/containers/Lists/List/List.C +++ b/src/OpenFOAM/containers/Lists/List/List.C @@ -38,7 +38,7 @@ License // * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * // template -const Foam::List Foam::List::zero = Foam::List(); +const Foam::List Foam::List::zero; // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H index 92fe7a539..940e7a2dd 100644 --- a/src/OpenFOAM/containers/Lists/UList/UListI.H +++ b/src/OpenFOAM/containers/Lists/UList/UListI.H @@ -31,7 +31,7 @@ License // * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * // template -const Foam::UList Foam::UList::zero = UList(); +const Foam::UList Foam::UList::zero; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C index 2e6bafc7c..714678de4 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.C +++ b/src/OpenFOAM/fields/Fields/Field/Field.C @@ -40,7 +40,8 @@ template const char* const Field::typeName("Field"); template -const Field Field::zero = Field(); +const Field Field::zero; + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C index e194b16c1..cfbea4673 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.C +++ b/src/OpenFOAM/matrices/Matrix/Matrix.C @@ -29,8 +29,8 @@ License // * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * // template -const Foam::Matrix Foam::Matrix::zero = - Foam::Matrix(); +const Foam::Matrix Foam::Matrix::zero; + // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // diff --git a/src/OpenFOAM/memory/Xfer/XferI.H b/src/OpenFOAM/memory/Xfer/XferI.H index 588379385..a9a7414fa 100644 --- a/src/OpenFOAM/memory/Xfer/XferI.H +++ b/src/OpenFOAM/memory/Xfer/XferI.H @@ -27,7 +27,7 @@ License // * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * // template -const Foam::Xfer Foam::Xfer::zero = Foam::Xfer(); +const Foam::Xfer Foam::Xfer::zero; // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //