From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4B75B3858D1E; Thu, 13 Jul 2023 16:59:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B75B3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689267570; bh=EPHX0JBtguW+5oT6MY/BR2ZmlSsRX6SDG3m0YMH592o=; h=From:To:Subject:Date:From; b=HbQc56owA8fLn6xeUXN1jy3e83xswQOaUunvjDJLZn8bJ3PaH1DeKGf14H/K37YJl SJAqOGmkiGcu3Ku0EvI/OU5+YAJZOoTSpIu2syqT58eabRHN95HUempR0sv32owofS UNMPxs4eAq2fpLrdrAjYHiG6zrkudwyvOsi+/ae0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-2504] libstdc++: std::stoi etc. do not need C99 support [PR110653] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 337649c1660211db733c1ba34ae260b8c66a3578 X-Git-Newrev: a1d12752f8d45df5d7962cef6e2a87585002e982 Message-Id: <20230713165930.4B75B3858D1E@sourceware.org> Date: Thu, 13 Jul 2023 16:59:30 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a1d12752f8d45df5d7962cef6e2a87585002e982 commit r14-2504-ga1d12752f8d45df5d7962cef6e2a87585002e982 Author: Jonathan Wakely Date: Thu Jul 13 10:44:57 2023 +0100 libstdc++: std::stoi etc. do not need C99 support [PR110653] std::stoi, std::stol, std::stoul, and std::stod only depend on C89 functions, so don't need to be guarded by _GLIBCXX_USE_C99_STDLIB std::stoll and std::stoull don't need C99 strtoll and strtoull if sizeof(long) == sizeof(long long). std::stold doesn't need C99 strtold if DBL_MANT_DIG == LDBL_MANT_DIG. This only applies to the narrow character overloads, the wchar_t overloads depend on a separate _GLIBCXX_USE_C99_WCHAR macro and none of them can be implemented in C89 easily. libstdc++-v3/ChangeLog: PR libstdc++/110653 * include/bits/basic_string.h (stoi, stol, stoul, stod): Do not depend on _GLIBCXX_USE_C99_STDLIB. [__LONG_WIDTH__ == __LONG_LONG_WIDTH__] (stoll, stoull): Define in terms of stol and stoul respectively. [__DBL_MANT_DIG__ == __LDBL_MANT_DIG__] (stold): Define in terms of stod. Diff: --- libstdc++-v3/include/bits/basic_string.h | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index d15f0f0589f..01e25dad20e 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -4108,7 +4108,6 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_CXX11 -#if _GLIBCXX_USE_C99_STDLIB // 21.4 Numeric Conversions [string.conversions]. inline int stoi(const string& __str, size_t* __idx = 0, int __base = 10) @@ -4125,6 +4124,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { return __gnu_cxx::__stoa(&std::strtoul, "stoul", __str.c_str(), __idx, __base); } +#if _GLIBCXX_USE_C99_STDLIB inline long long stoll(const string& __str, size_t* __idx = 0, int __base = 10) { return __gnu_cxx::__stoa(&std::strtoll, "stoll", __str.c_str(), @@ -4134,19 +4134,33 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 stoull(const string& __str, size_t* __idx = 0, int __base = 10) { return __gnu_cxx::__stoa(&std::strtoull, "stoull", __str.c_str(), __idx, __base); } +#elif __LONG_WIDTH__ == __LONG_LONG_WIDTH__ + inline long long + stoll(const string& __str, size_t* __idx = 0, int __base = 10) + { return std::stol(__str, __idx, __base); } - // NB: strtof vs strtod. - inline float - stof(const string& __str, size_t* __idx = 0) - { return __gnu_cxx::__stoa(&std::strtof, "stof", __str.c_str(), __idx); } + inline unsigned long long + stoull(const string& __str, size_t* __idx = 0, int __base = 10) + { return std::stoul(__str, __idx, __base); } +#endif inline double stod(const string& __str, size_t* __idx = 0) { return __gnu_cxx::__stoa(&std::strtod, "stod", __str.c_str(), __idx); } +#if _GLIBCXX_USE_C99_STDLIB + // NB: strtof vs strtod. + inline float + stof(const string& __str, size_t* __idx = 0) + { return __gnu_cxx::__stoa(&std::strtof, "stof", __str.c_str(), __idx); } + inline long double stold(const string& __str, size_t* __idx = 0) { return __gnu_cxx::__stoa(&std::strtold, "stold", __str.c_str(), __idx); } +#elif __DBL_MANT_DIG__ == __LDBL_MANT_DIG__ + inline long double + stold(const string& __str, size_t* __idx = 0) + { return std::stod(__str, __idx); } #endif // _GLIBCXX_USE_C99_STDLIB // DR 1261. Insufficent overloads for to_string / to_wstring