zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: drop construct Field from SubField for non-Intel

Browse Source 
- duplicates existing SubField -> Field conversion method
- retain for Intel until we confirm it works there too
This commit is contained in:
Mark Olesen
2010-12-17 15:46:56 +01:00
parent 9224daad7b
commit 97517208ad
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/OpenFOAM/fields/Fields/Field/Field.C
View File

@ -166,8 +166,7 @@ Foam::Field<Type>::Field(const Xfer<Field<Type> >& f)
{}
#ifndef __GNUC__
// Not needed for clang/gcc
#ifdef __INTEL_COMPILER
template<class Type>
Foam::Field<Type>::Field(const typename Field<Type>::subField& sf)
:

4
src/OpenFOAM/fields/Fields/Field/Field.H
View File

@ -176,8 +176,10 @@ public:
//- Construct by transferring the Field contents
Field(const Xfer<Field<Type> >&);
#ifdef __INTEL_COMPILER
//- Construct as copy of subField
Field(const typename Field<Type>::subField&);
#endif
//- Construct as copy of tmp<Field>
# ifdef ConstructFromTmp
@ -188,7 +190,7 @@ public:
Field(Istream&);
//- Construct from a dictionary entry
Field(const word& keyword, const dictionary& dict, const label size);
Field(const word& keyword, const dictionary&, const label size);
//- Clone
tmp<Field<Type> > clone() const;