Skip to content
Snippets Groups Projects
Commit 618753c5 authored by Henry Weller's avatar Henry Weller
Browse files

C++11: Update compilation rules to specify C++11 support and conformance 

The change from C++0x to C++11 allows all of C++11 functionality to be
used in OpenFOAM, in particular constructor delegation which avoids code
duplication or constructor helper functions.  However, this also means a
change to the minimum gcc version supported which is now 4.7 rather than
4.5.

Note that gcc-4.7 does not support the entire C++11 standard but does
support all of the functionality currently needed for further OpenFOAM
development.  The minimum gcc-version which supports the entire C++11
standard is 4.8 which is now the recommended minimum gcc version.
parent 42e6cf57
Branches
Tags
1 merge request!60Merge foundation
Hide whitespace changes
Inline Side-by-side
Showing
with 15 additions and 27 deletions
etc/config.csh/settings
+ 0
− 6
View file @ 618753c5
......@@ -225,12 +225,6 @@ case ThirdParty:
case Gcc48:
set gcc_version=gcc-4.8.5
breaksw
case Gcc45:
set gcc_version=gcc-4.5.4
breaksw
case Gcc46:
set gcc_version=gcc-4.6.4
breaksw
case Gcc47:
set gcc_version=gcc-4.7.4
breaksw
......
etc/config.sh/compiler
+ 0
− 6
View file @ 618753c5
......@@ -42,12 +42,6 @@ OpenFOAM | ThirdParty)
Gcc | Gcc48)
gcc_version=gcc-4.8.5
;;
Gcc45)
gcc_version=gcc-4.5.4
;;
Gcc46)
gcc_version=gcc-4.6.4
;;
Gcc47)
gcc_version=gcc-4.7.4
;;
......
wmake/rules/linux64Clang/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value
CC = clang++ -std=c++0x -m64
CC = clang++ -std=c++11 -m64
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linux64Gcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++0x -m64
CC = g++ -std=c++11 -m64
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linux64GccKNL/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++0x -m64 -march=knl -DvectorMachine -DKNL
CC = g++ -std=c++11 -m64 -march=knl -DvectorMachine -DKNL
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linux64Icc/c++
+ 1
− 1
View file @ 618753c5
......@@ -6,7 +6,7 @@ c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invali
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -diag-disable 1224,2026,2305
CC = icpc -std=c++0x -fp-trap=common -fp-model precise
CC = icpc -std=c++11 -fp-trap=common -fp-model precise
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linux64IccKNL/c++
+ 1
− 1
View file @ 618753c5
......@@ -6,7 +6,7 @@ c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invali
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -diag-disable 1224,2026,2305
CC = icpc -std=c++0x -fp-trap=common -fp-model precise -fp-speculation=safe -DKNL
CC = icpc -std=c++11 -fp-trap=common -fp-model precise -fp-speculation=safe -DKNL
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxARM7Gcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++0x
CC = g++ -std=c++11
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxClang/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedef -Wno-tautological-undefined-compare -Wno-shift-negative-value
CC = clang++ -std=c++0x -m32
CC = clang++ -std=c++11 -m32
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxGcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++0x -m32
CC = g++ -std=c++11 -m32
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxIA64Gcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++0x
CC = g++ -std=c++11
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxIA64Icc/c++
+ 1
− 1
View file @ 618753c5
......@@ -6,7 +6,7 @@ c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invali
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -diag-disable 1224,2026,2305
CC = icpc -std=c++0x
CC = icpc -std=c++11
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxIcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -6,7 +6,7 @@ c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invali
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -diag-disable 1224,2026,2305
CC = icpc -std=c++0x -fp-trap=common -fp-model precise
CC = icpc -std=c++11 -fp-trap=common -fp-model precise
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxPPC64Gcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++0x -m64 -mcpu=power5+
CC = g++ -std=c++11 -m64 -mcpu=power5+
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/linuxPPC64leGcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++0x -m64 -mcpu=power8
CC = g++ -std=c++11 -m64 -mcpu=power8
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/solaris64Gcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN =
CC = g++ -std=c++0x -m64
CC = g++ -std=c++11 -m64
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
wmake/rules/solarisGcc/c++
+ 1
− 1
View file @ 618753c5
......@@ -5,7 +5,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-para
# Suppress some warnings for flex++ and CGAL
c++LESSWARN =
CC = g++ -std=c++0x
CC = g++ -std=c++11
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
......
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