Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to full C++11 standard #1119

Merged
merged 2 commits into from
Oct 17, 2021
Merged

Update to full C++11 standard #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
141ed14
Update minimum C++ standard to C++11
ischoegl Oct 16, 2021
f7d5e9a
Replace c++0x by c++11
ischoegl Oct 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@
* Class names use `InitialCapsNames`
* Methods use `camelCaseNames`
* Do not indent the contents of namespaces
* Code may make use of most C++11 features, with the exceptions of delegating
constructors, inheriting constructors, and non-static data member
initializers. These limitations are needed to keep the minimum required
compiler versions at GCC 4.6, Clang 3.1, Visual Studio 2013 and Intel 14.0.
* Code should follow the C++11 standard, with minimum required compiler versions
GCC 4.8, Clang 3.4, MSVC 14.0 (2015) and Intel 15.0.
* Avoid manual memory management (i.e. `new` and `delete`), preferring to use
standard library containers, as well as `std::unique_ptr` and
`std::shared_ptr` when dynamic allocation is required.
Expand Down
6 changes: 3 additions & 3 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,9 @@ if 'gcc' in env.subst('$CC') or 'gnu-cc' in env.subst('$CC'):
defaults.optimizeCcFlags += ' -Wno-inline'
if env['OS'] == 'Cygwin':
# See http://stackoverflow.com/questions/18784112
defaults.cxxFlags = '-std=gnu++0x'
defaults.cxxFlags = '-std=gnu++11'
else:
defaults.cxxFlags = '-std=c++0x'
defaults.cxxFlags = '-std=c++11'
defaults.buildPch = True
env['pch_flags'] = ['-include', 'src/pch/system.h']

Expand All @@ -307,7 +307,7 @@ elif env['CC'] == 'cl': # Visual Studio
env['openmp_flag'] = ['/openmp']

elif 'icc' in env.subst('$CC'):
defaults.cxxFlags = '-std=c++0x'
defaults.cxxFlags = '-std=c++11'
defaults.ccFlags = '-vec-report0 -diag-disable 1478'
defaults.warningFlags = '-Wcheck'
env['openmp_flag'] = ['-openmp']
Expand Down