diff options
| author | Martin Liska <mliska@suse.cz> | 2022-08-18 15:35:14 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-08-18 15:35:14 +0200 |
| commit | c4cf402822be5b52516a727e6b2abc923d1a9d52 (patch) | |
| tree | d97b4c3407d27282cc3bcfda5a0052d37a325580 /libcpp | |
| parent | 87e8197e4012801477e3743601d6d6ead64e851c (diff) | |
| parent | 03119249b9cfedb48e910b8df6a832b206cced2b (diff) | |
| download | gcc-c4cf402822be5b52516a727e6b2abc923d1a9d52.zip gcc-c4cf402822be5b52516a727e6b2abc923d1a9d52.tar.gz gcc-c4cf402822be5b52516a727e6b2abc923d1a9d52.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 4 | ||||
| -rw-r--r-- | libcpp/init.cc | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 259adb9..ac99688 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2022-08-16 Tom Honermann <tom@honermann.net> + + PR c++/106423 + * include/cpplib.h (cpp_warning_reason): Add CPP_W_CXX20_COMPAT. + * init.cc (cpp_create_reader): Add cpp_warn_cxx20_compat. + 2022-08-08 Tom Honermann <tom@honermann.net> PR preprocessor/106426 diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index f9c042d..26e2b4c 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -547,6 +547,9 @@ struct cpp_options /* True if warn about differences between C++98 and C++11. */ bool cpp_warn_cxx11_compat; + /* True if warn about differences between C++17 and C++20. */ + bool cpp_warn_cxx20_compat; + /* Nonzero if bidirectional control characters checking is on. See enum cpp_bidirectional_level. */ unsigned char cpp_warn_bidirectional; @@ -655,6 +658,7 @@ enum cpp_warning_reason { CPP_W_C90_C99_COMPAT, CPP_W_C11_C2X_COMPAT, CPP_W_CXX11_COMPAT, + CPP_W_CXX20_COMPAT, CPP_W_EXPANSION_TO_DEFINED, CPP_W_BIDIRECTIONAL }; diff --git a/libcpp/init.cc b/libcpp/init.cc index 0242da5..59641a7 100644 --- a/libcpp/init.cc +++ b/libcpp/init.cc @@ -202,6 +202,7 @@ cpp_create_reader (enum c_lang lang, cpp_hash_table *table, CPP_OPTION (pfile, cpp_warn_c90_c99_compat) = -1; CPP_OPTION (pfile, cpp_warn_c11_c2x_compat) = -1; CPP_OPTION (pfile, cpp_warn_cxx11_compat) = 0; + CPP_OPTION (pfile, cpp_warn_cxx20_compat) = 0; CPP_OPTION (pfile, cpp_warn_deprecated) = 1; CPP_OPTION (pfile, cpp_warn_long_long) = 0; CPP_OPTION (pfile, dollars_in_ident) = 1; |