From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1984) id 3072D3858C60; Tue, 7 Dec 2021 10:46:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3072D3858C60 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tamar Christina To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-5819] Revert "libstdc++: Fix ctype changed after newlib update." X-Act-Checkin: gcc X-Git-Author: Tamar Christina X-Git-Refname: refs/heads/master X-Git-Oldrev: 30a08286e67e3aee17347f8d02e8f868a995beb9 X-Git-Newrev: ba6bb287f03d42ab6c4f39ce99dcf94ec5113655 Message-Id: <20211207104655.3072D3858C60@sourceware.org> Date: Tue, 7 Dec 2021 10:46:55 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2021 10:46:55 -0000 https://gcc.gnu.org/g:ba6bb287f03d42ab6c4f39ce99dcf94ec5113655 commit r12-5819-gba6bb287f03d42ab6c4f39ce99dcf94ec5113655 Author: Tamar Christina Date: Tue Dec 7 10:37:30 2021 +0000 Revert "libstdc++: Fix ctype changed after newlib update." Newlib has reverted the commit that caused us to require a workaround. As such we can now revert the workaround. This reverts commit 0e510ab53414430e93c6f5b64841e2f40031cda7. libstdc++-v3/ChangeLog: PR libstdc++/103305 * config/os/newlib/ctype_base.h (upper, lower, alpha, digit, xdigit, space, print, graph, cntrl, punct, alnum, blank): Revert. Diff: --- libstdc++-v3/config/os/newlib/ctype_base.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libstdc++-v3/config/os/newlib/ctype_base.h b/libstdc++-v3/config/os/newlib/ctype_base.h index 3a7477afdcc..33654d7794a 100644 --- a/libstdc++-v3/config/os/newlib/ctype_base.h +++ b/libstdc++-v3/config/os/newlib/ctype_base.h @@ -41,7 +41,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // NB: Offsets into ctype::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. typedef char mask; -#if defined _U && defined _L && defined _N && defined _S static const mask upper = _U; static const mask lower = _L; static const mask alpha = _U | _L; @@ -53,24 +52,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static const mask cntrl = _C; static const mask punct = _P; static const mask alnum = _U | _L | _N; -# if __cplusplus >= 201103L +#if __cplusplus >= 201103L static const mask blank = space; -# endif -#else - static const mask upper = _ISupper; - static const mask lower = _ISlower; - static const mask alpha = _ISupper | _ISlower; - static const mask digit = _ISdigit; - static const mask xdigit = _ISxdigit | _ISdigit; - static const mask space = _ISspace; - static const mask print = _ISpunct | _ISupper | _ISlower | _ISdigit | _ISblank; - static const mask graph = _ISpunct | _ISupper | _ISlower | _ISdigit; - static const mask cntrl = _IScntrl; - static const mask punct = _ISpunct; - static const mask alnum = _ISupper | _ISlower | _ISdigit; -# if __cplusplus >= 201103L - static const mask blank = _ISspace | _ISblank; -# endif #endif };