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

Upgrade to clang-3.2

Browse Source 
writeAddSubtractField.C: explicitly dereference tmp to keep clang3.2 happy
This commit is contained in:
Henry
2013-05-03 17:14:27 +01:00
parent 6b19bb2193
commit 5c05b40815
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etc/config/settings.csh
View File

@ -242,8 +242,7 @@ case ThirdParty:
# using clang - not gcc # using clang - not gcc
setenv WM_CC 'clang' setenv WM_CC 'clang'
setenv WM_CXX 'clang++' setenv WM_CXX 'clang++'
set clang_version=llvm-3.1 set clang_version=llvm-3.2
#set clang_version=llvm-svn
breaksw breaksw
default: default:
echo echo

3
etc/config/settings.sh
View File

@ -262,8 +262,7 @@ OpenFOAM | ThirdParty)
# using clang - not gcc # using clang - not gcc
export WM_CC='clang' export WM_CC='clang'
export WM_CXX='clang++' export WM_CXX='clang++'
clang_version=llvm-3.1 clang_version=llvm-3.2
#clang_version=llvm-svn
;; ;;
*) *)
echo 1>&2 echo 1>&2

1
src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
View File

@ -297,4 +297,3 @@ void Foam::calcTypes::addSubtract::calc
// ************************************************************************* // // ************************************************************************* //

6
src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -72,7 +72,9 @@ void Foam::calcTypes::addSubtract::writeAddSubtractField
mesh, mesh,
IOobject::NO_READ IOobject::NO_READ
), ),
calcMode_ == ADD ? baseField + addField : baseField - addField calcMode_ == ADD
? (baseField + addField)()
: (baseField - addField)()
); );
newField.write(); newField.write();
} }