diff options
| author | Martin Ejdestig <marejde@gmail.com> | 2015-12-27 12:06:33 +0100 |
|---|---|---|
| committer | Martin Ejdestig <marejde@gmail.com> | 2015-12-27 12:06:33 +0100 |
| commit | c75d2fc6099c0461c72be33bbcf4f5dfc14ff7d3 (patch) | |
| tree | bac0b122ec99d906e66b103c8c64b570794ad8de | |
| parent | 84f138e69a0c9e0f429dee8e5dd73d5fd68e6ded (diff) | |
| download | meson-c75d2fc6099c0461c72be33bbcf4f5dfc14ff7d3.zip meson-c75d2fc6099c0461c72be33bbcf4f5dfc14ff7d3.tar.gz meson-c75d2fc6099c0461c72be33bbcf4f5dfc14ff7d3.tar.bz2 | |
Replace c++1y with c++14 as a choice for cpp_std
c++1y is deprecated in GCC 5 (see -std option in man page). Not sure about
Clang since the documentation is a bit more sparse. But it is probably a
good idea to keep them in sync and also to prefer c++14 over c++1y since
c++1y was only temporary until the standard was done.
| -rw-r--r-- | compilers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compilers.py b/compilers.py index 6be55b4..06dd1d0 100644 --- a/compilers.py +++ b/compilers.py @@ -1423,7 +1423,7 @@ class GnuCPPCompiler(CPPCompiler): def get_options(self): opts = {'cpp_std' : coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++03', 'c++11', 'c++1y'], + ['none', 'c++03', 'c++11', 'c++14'], 'c++11')} if self.gcc_type == GCC_MINGW: opts.update({ @@ -1469,7 +1469,7 @@ class ClangCPPCompiler(CPPCompiler): def get_options(self): return {'cpp_std' : coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++03', 'c++11', 'c++1y'], + ['none', 'c++03', 'c++11', 'c++14'], 'c++11')} def get_option_compile_args(self, options): |