Commit 5c05b408 authored by Henry's avatar Henry
Browse files

Upgrade to clang-3.2

writeAddSubtractField.C: explicitly dereference tmp to keep clang3.2 happy
parent 6b19bb21
......@@ -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
......
......@@ -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
......
......@@ -297,4 +297,3 @@ void Foam::calcTypes::addSubtract::calc
// ************************************************************************* //
......@@ -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();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment