Upgrade to clang-3.2

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

View File

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

View File

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

View File

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

View File

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