Merge pull request #339 from martin-ejdestig/cpp_std_trivial_fixes

cpp_std trivial fixes

authors.txt

@@ -24,4 +24,5 @@ German Diago Gomez
 Kyle Manna
 Haakon Sporsheim
 Wink Saville
-Yoav Alon
+Yoav Alon
+Martin Ejdestig

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):