diff options
| author | Paolo Carlini <paolo@gcc.gnu.org> | 2013-04-24 19:33:54 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-04-24 19:33:54 +0000 |
| commit | 61949153f4972928c912cf1a93f5ef869e5c9484 (patch) | |
| tree | 91930b32804dd6992b551ef2b873cca0c78f0181 /gcc | |
| parent | 5576178bbdd88f7e5a3ceb27c1de3d6bf4856de0 (diff) | |
| download | gcc-61949153f4972928c912cf1a93f5ef869e5c9484.zip gcc-61949153f4972928c912cf1a93f5ef869e5c9484.tar.gz gcc-61949153f4972928c912cf1a93f5ef869e5c9484.tar.bz2 | |
cpplib.h (enum c_lang): Add CLK_GNUCXX1Y and CLK_CXX1Y.
/libcpp
2013-04-24 Paolo Carlini <paolo.carlini@oracle.com>
* include/cpplib.h (enum c_lang): Add CLK_GNUCXX1Y and CLK_CXX1Y.
* init.c (lang_defaults): Add defaults for the latter.
(cpp_init_builtins): Define __cplusplus as 201300L for the latter.
* lex.c (_cpp_lex_direct): Update.
/gcc/c-family
2013-04-24 Paolo Carlini <paolo.carlini@oracle.com>
* c-opts.c (set_std_cxx11): Use CLK_CXX1Y and CLK_GNUCXX1Y.
/gcc/testsuite
2013-04-24 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/cpp1y/cplusplus.C: New.
From-SVN: r198261
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c-family/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-family/c-opts.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/cplusplus.C | 5 |
4 files changed, 14 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index b246b2b..39390db 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,5 +1,9 @@ 2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + * c-opts.c (set_std_cxx11): Use CLK_CXX1Y and CLK_GNUCXX1Y. + +2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + * c-cppbuiltin.c (c_cpp_builtins): Do not define __GXX_EXPERIMENTAL_CXX1Y__. diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 4b6990a..ea5a605 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -1471,7 +1471,7 @@ set_std_cxx11 (int iso) static void set_std_cxx1y (int iso) { - cpp_set_lang (parse_in, iso ? CLK_CXX11: CLK_GNUCXX11); + cpp_set_lang (parse_in, iso ? CLK_CXX1Y: CLK_GNUCXX1Y); flag_no_gnu_keywords = iso; flag_no_nonansi_builtin = iso; flag_iso = iso; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b199baa..e3b4a56 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + * g++.dg/cpp1y/cplusplus.C: New. + +2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + * g++.dg/cpp1y/cxx1y_macro.C: Remove. 2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> diff --git a/gcc/testsuite/g++.dg/cpp1y/cplusplus.C b/gcc/testsuite/g++.dg/cpp1y/cplusplus.C new file mode 100644 index 0000000..0b69593 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/cplusplus.C @@ -0,0 +1,5 @@ +// { dg-options "-std=c++1y" } + +#if __cplusplus <= 201103L +#error +#endif |