diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-25 05:05:01 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-25 05:05:01 +0000 |
| commit | c35e53f1c697984a903d731bec157bc9f7aeb07b (patch) | |
| tree | d336eea618bf43328e36d2b18690a8a1c4b26f95 /gcc/c-family/c-opts.c | |
| parent | 0bad5c9c9e70a4f4d6a83101e60be87888d02261 (diff) | |
| download | gcc-c35e53f1c697984a903d731bec157bc9f7aeb07b.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214414 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family/c-opts.c')
| -rw-r--r-- | gcc/c-family/c-opts.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 42f175928fd..1b01b4fcaef 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) { |