aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--authors.txt3
-rw-r--r--compilers.py6
2 files changed, 5 insertions, 4 deletions
diff --git a/authors.txt b/authors.txt
index c3720b5..ccb8e83 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
diff --git a/compilers.py b/compilers.py
index eea79d0..06dd1d0 100644
--- a/compilers.py
+++ b/compilers.py
@@ -1422,8 +1422,8 @@ 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',
- ['none', 'c++03', 'c++11', 'c++1y'],
+ opts = {'cpp_std' : coredata.UserComboOption('cpp_std', 'C++ language standard to use',
+ ['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):