aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-family/c-opts.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2014-08-25 01:05:01 -0400
committerJason Merrill <jason@gcc.gnu.org>2014-08-25 01:05:01 -0400
commit028aee171abc1b13e97734bac4a3db46743d7a6b (patch)
treed336eea618bf43328e36d2b18690a8a1c4b26f95 /gcc/c-family/c-opts.c
parent3f0d513197d9b0872b016229f5d1d1c76adb39b7 (diff)
downloadgcc-028aee171abc1b13e97734bac4a3db46743d7a6b.zip
gcc-028aee171abc1b13e97734bac4a3db46743d7a6b.tar.gz
gcc-028aee171abc1b13e97734bac4a3db46743d7a6b.tar.bz2
c.opt: Change -std=c++1y and -std=gnu++1y to be aliases for -std=c++14 and -std=gnu++14...
* c.opt: Change -std=c++1y and -std=gnu++1y to be aliases for -std=c++14 and -std=gnu++14, rather than the reverse. * c-opts.c (c_common_handle_option): Change OPT_std_c__1y and OPT_std_gnu__1y to OPT_std_c__14 and OPT_std_gnu__14. * c-common.h (cxx_dialect): Remove cxx1y. From-SVN: r214414
Diffstat (limited to 'gcc/c-family/c-opts.c')
-rw-r--r--gcc/c-family/c-opts.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 42f1759..1b01b4f 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -698,12 +698,12 @@ c_common_handle_option (size_t scode, const char *arg, int value,
}
break;
- case OPT_std_c__1y:
- case OPT_std_gnu__1y:
+ case OPT_std_c__14:
+ case OPT_std_gnu__14:
if (!preprocessing_asm_p)
{
- set_std_cxx14 (code == OPT_std_c__1y /* ISO */);
- if (code == OPT_std_c__1y)
+ set_std_cxx14 (code == OPT_std_c__14 /* ISO */);
+ if (code == OPT_std_c__14)
cpp_opts->ext_numeric_literals = 0;
}
break;
@@ -1587,7 +1587,7 @@ set_std_cxx11 (int iso)
cxx_dialect = cxx11;
}
-/* Set the C++ 201y draft standard (without GNU extensions if ISO). */
+/* Set the C++ 2014 draft standard (without GNU extensions if ISO). */
static void
set_std_cxx14 (int iso)
{