aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-11-21 17:42:14 -0500
committerJason Merrill <jason@redhat.com>2022-11-22 09:27:02 -0500
commitac5054144bd2248e948842937448eb5f4ce36bfd (patch)
tree707b6dfbb8916e2df26f9141684e0193e1ffef49
parent4eb3a48698b2ca43967a4e7e7cfc0408192e85b2 (diff)
downloadgcc-ac5054144bd2248e948842937448eb5f4ce36bfd.zip
gcc-ac5054144bd2248e948842937448eb5f4ce36bfd.tar.gz
gcc-ac5054144bd2248e948842937448eb5f4ce36bfd.tar.bz2
c++: don't use strchrnul [PR107781]
The contracts implementation was using strchrnul, which is a glibc extension, so bootstrap broke on non-glibc targets. Use C89 strcspn instead. PR c++/107781 gcc/cp/ChangeLog: * contracts.cc (role_name_equal): Use strcspn instead of strchrnul.
-rw-r--r--gcc/cp/contracts.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc
index f3afcc6..a909701 100644
--- a/gcc/cp/contracts.cc
+++ b/gcc/cp/contracts.cc
@@ -210,8 +210,8 @@ lookup_concrete_semantic (const char *name)
static bool
role_name_equal (const char *role, const char *name)
{
- size_t role_len = strchrnul (role, ':') - role;
- size_t name_len = strchrnul (name, ':') - name;
+ size_t role_len = strcspn (role, ":");
+ size_t name_len = strcspn (name, ":");
if (role_len != name_len)
return false;
return strncmp (role, name, role_len) == 0;