From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 17387385E017; Thu, 17 Aug 2023 23:28:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 17387385E017 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1692314938; bh=AsmSAClTtgZOwM5pONQ3E71eDSFVME+7xlKd3TVwez4=; h=From:To:Subject:Date:From; b=HFUQUABVxdQCWMrqOmMKJJURYBsF558JnFgT7+A4tbggfcRyluT43SI4q4+XcPe9h 4xBVY7qSc/oDIhljz+lH621XaeXtUBXjryPExOH7LtISbjEK5T8C10rKSKQx6JVe/8 rLxZs5F2YFLpTjvLI//XyP/kXbklxFsY5FgR3j3g= 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-3310] Revert "libstdc++: Reuse double overload of __convert_to_v if possible" X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: d82a85b6161cbeebfe3de5d3d4cdd355e4617e69 X-Git-Newrev: b860e657802b96ea2f00e53b2040ef100bedbc89 Message-Id: <20230817232858.17387385E017@sourceware.org> Date: Thu, 17 Aug 2023 23:28:58 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b860e657802b96ea2f00e53b2040ef100bedbc89 commit r14-3310-gb860e657802b96ea2f00e53b2040ef100bedbc89 Author: Jonathan Wakely Date: Fri Aug 18 00:26:49 2023 +0100 Revert "libstdc++: Reuse double overload of __convert_to_v if possible" This reverts commit aad83d61d2e92b168688f7b6bd00b8604d11fc9f. libstdc++-v3/ChangeLog: * config/locale/generic/c_locale.cc: Diff: --- libstdc++-v3/config/locale/generic/c_locale.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc index 866ba0361dc4..8849d78fdfac 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.cc +++ b/libstdc++-v3/config/locale/generic/c_locale.cc @@ -187,11 +187,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err, const __c_locale&) throw() { -#if __DBL_MANT_DIG__ == __LDBL_MANT_DIG__ - double __d; - __convert_to_v(__s, __d, __err, __c_locale); - __v = __d; -#else // Assumes __s formatted for "C" locale. const char* __sav = __set_C_locale(); if (!__sav) @@ -238,7 +233,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION setlocale(LC_ALL, __sav); delete [] __sav; -#endif // __DBL_MANT_DIG__ == __LDBL_MANT_DIG__ } void