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

GIT: resolve conflict

Browse Source
This commit is contained in:
andy
2014-01-14 12:55:56 +00:00
parent 6b210784dc b9311f0507
commit bd6584def4
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/postProcessing/functionObjects/field/streamLine/streamLine.C
View File

@ -626,7 +626,7 @@ void Foam::streamLine::write()
} }
Info<< " Tracks:" << allTracks_.size() << nl Info<< " Tracks:" << allTracks_.size() << nl
<< " Tottal samples:" << n << " Total samples:" << n
<< endl; << endl;

2
wmake/rules/linux64Icc/c++
View File

@ -1,6 +1,6 @@
.SUFFIXES: .C .cxx .cc .cpp .SUFFIXES: .C .cxx .cc .cpp
c++WARN = -wd327,654,819,1125,1476,1505,1572 c++WARN = -wd327,525,654,819,1125,1476,1505,1572
CC = icpc -std=c++0x CC = icpc -std=c++0x

2
wmake/rules/linuxIA64Icc/c++
View File

@ -1,6 +1,6 @@
.SUFFIXES: .C .cxx .cc .cpp .SUFFIXES: .C .cxx .cc .cpp
c++WARN = -wd327,654,819,1125,1476,1505,1572 c++WARN = -wd327,525,654,819,1125,1476,1505,1572
CC = icpc CC = icpc

2
wmake/rules/linuxIcc/c++
View File

@ -1,6 +1,6 @@
.SUFFIXES: .C .cxx .cc .cpp .SUFFIXES: .C .cxx .cc .cpp
c++WARN = -wd327,654,819,1125,1476,1505,1572 c++WARN = -wd327,525,654,819,1125,1476,1505,1572
#CC = icpc -gcc-version=400 #CC = icpc -gcc-version=400
CC = icpc -std=c++0x CC = icpc -std=c++0x