aboutsummaryrefslogtreecommitdiff
path: root/libcpp/charset.cc
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-11-04 13:22:10 +0000
committerGitHub <noreply@github.com>2022-11-04 13:22:10 +0000
commit0a59abbfc74c3961fb01323d9fbff8427518fde6 (patch)
treeb17389116bc4da1d022345b7b78eb6fc0fbe4eb0 /libcpp/charset.cc
parentf8c2fab0c6c11f73fdcb1eb31e8b5b75c2fdbf7f (diff)
parenta7b70c704182db2defd0c0f991c16f4d9219bc2f (diff)
downloadgcc-0a59abbfc74c3961fb01323d9fbff8427518fde6.zip
gcc-0a59abbfc74c3961fb01323d9fbff8427518fde6.tar.gz
gcc-0a59abbfc74c3961fb01323d9fbff8427518fde6.tar.bz2
Merge #1627
1627: Merge GCC mainline/master into gccrs/master r=CohenArthur a=ibuclaw `@doko42` was asking, so here's another merge sync. Co-authored-by: GCC Administrator <gccadmin@gcc.gnu.org> Co-authored-by: Andrew MacLeod <amacleod@redhat.com> Co-authored-by: Liwei Xu <liwei.xu@intel.com> Co-authored-by: Richard Biener <rguenther@suse.de> Co-authored-by: Jakub Jelinek <jakub@redhat.com> Co-authored-by: Andre Vieira <andre.simoesdiasvieira@arm.com> Co-authored-by: Jonathan Wakely <jwakely@redhat.com> Co-authored-by: Martin Jambor <mjambor@suse.cz> Co-authored-by: Joseph Myers <joseph@codesourcery.com> Co-authored-by: Patrick Palka <ppalka@redhat.com> Co-authored-by: Florian Weimer <fweimer@redhat.com> Co-authored-by: Marek Polacek <polacek@redhat.com> Co-authored-by: liuhongt <hongtao.liu@intel.com> Co-authored-by: Martin Liska <mliska@suse.cz> Co-authored-by: Robin Dapp <rdapp@linux.ibm.com> Co-authored-by: Takayuki 'January June' Suwa <jjsuwa_sys3175@yahoo.co.jp> Co-authored-by: Stefan Schulze Frielinghaus <stefansf@linux.ibm.com>
Diffstat (limited to 'libcpp/charset.cc')
-rw-r--r--libcpp/charset.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcpp/charset.cc b/libcpp/charset.cc
index 6834969..12a398e 100644
--- a/libcpp/charset.cc
+++ b/libcpp/charset.cc
@@ -1291,7 +1291,7 @@ ucn_valid_in_identifier (cpp_reader *pfile, cppchar_t c,
valid_flags = C99 | CXX | C11 | CXX23;
if (CPP_PEDANTIC (pfile))
{
- if (CPP_OPTION (pfile, cplusplus))
+ if (CPP_OPTION (pfile, xid_identifiers))
valid_flags = CXX23;
else if (CPP_OPTION (pfile, c11_identifiers))
valid_flags = C11;
@@ -1355,7 +1355,7 @@ ucn_valid_in_identifier (cpp_reader *pfile, cppchar_t c,
return 2;
}
- if (CPP_OPTION (pfile, cplusplus))
+ if (CPP_OPTION (pfile, xid_identifiers))
invalid_start_flags = NXX23;
else if (CPP_OPTION (pfile, c11_identifiers))
invalid_start_flags = N11;