From 84f138e69a0c9e0f429dee8e5dd73d5fd68e6ded Mon Sep 17 00:00:00 2001 From: Martin Ejdestig Date: Sun, 27 Dec 2015 11:53:07 +0100 Subject: [PATCH 1/3] Fix typo in description of cpp_std option for GnuCPPCompiler It is already correct for ClangCPPCompiler. --- compilers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compilers.py b/compilers.py index eea79d070..6be55b49e 100644 --- a/compilers.py +++ b/compilers.py @@ -1422,7 +1422,7 @@ class GnuCPPCompiler(CPPCompiler): return get_gcc_soname_args(self.gcc_type, shlib_name, path, soversion) def get_options(self): - opts = {'cpp_std' : coredata.UserComboOption('cpp_std', 'C language standard to use', + opts = {'cpp_std' : coredata.UserComboOption('cpp_std', 'C++ language standard to use', ['none', 'c++03', 'c++11', 'c++1y'], 'c++11')} if self.gcc_type == GCC_MINGW: From c75d2fc6099c0461c72be33bbcf4f5dfc14ff7d3 Mon Sep 17 00:00:00 2001 From: Martin Ejdestig Date: Sun, 27 Dec 2015 12:06:33 +0100 Subject: [PATCH 2/3] 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. --- compilers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compilers.py b/compilers.py index 6be55b49e..06dd1d049 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): From 9cb3ed4014be79a2d514cce30d219649c0adca54 Mon Sep 17 00:00:00 2001 From: Martin Ejdestig Date: Sun, 27 Dec 2015 21:50:10 +0100 Subject: [PATCH 3/3] Add myself to authors.txt --- authors.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/authors.txt b/authors.txt index c3720b542..ccb8e838c 100644 --- a/authors.txt +++ b/authors.txt @@ -24,4 +24,5 @@ German Diago Gomez Kyle Manna Haakon Sporsheim Wink Saville -Yoav Alon \ No newline at end of file +Yoav Alon +Martin Ejdestig