mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 13:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Workaround for missing 'using enum' in Clang 12

Browse Source 
Once we no longer care about older compilers without this feature, we
can drop these static data members, so the names don't have to be
visible at class scope.

libstdc++-v3/ChangeLog:

	* libsupc++/compare (_Strong_order) [!__cpp_using_enum]: Add
	static data members for _Fp_fmt enumerators.
This commit is contained in:
Jonathan Wakely 2022-03-28 12:27:23 +01:00
parent 7255d29c57
commit 8bbeffc102
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libstdc++-v3/libsupc++/compare
View File

@ -677,12 +677,25 @@ namespace std
// TODO: _Bfloat16,
};
#ifndef __cpp_using_enum
// XXX Remove these once 'using enum' support is ubiquitous.
static constexpr _Fp_fmt _Binary16 = _Fp_fmt::_Binary16;
static constexpr _Fp_fmt _Binary32 = _Fp_fmt::_Binary32;
static constexpr _Fp_fmt _Binary64 = _Fp_fmt::_Binary64;
static constexpr _Fp_fmt _Binary128 = _Fp_fmt::_Binary128;
static constexpr _Fp_fmt _X86_80bit = _Fp_fmt::_X86_80bit;
static constexpr _Fp_fmt _M68k_80bit = _Fp_fmt::_M68k_80bit;
static constexpr _Fp_fmt _Dbldbl = _Fp_fmt::_Dbldbl;
#endif
// Identify the format used by a floating-point type.
template<typename _Tp>
static consteval _Fp_fmt
_S_fp_fmt() noexcept
{
#ifdef __cpp_using_enum
using enum _Fp_fmt;
#endif
// Identify these formats first, then assume anything else is IEEE.
// N.B. ARM __fp16 alternative format can be handled as binary16.
@ -810,7 +823,9 @@ namespace std
return __builtin_bit_cast(int16_t, __val);
else
{
#ifdef __cpp_using_enum
using enum _Fp_fmt;
#endif
constexpr auto __fmt = _S_fp_fmt<_Tp>();
if constexpr (__fmt == _X86_80bit || __fmt == _M68k_80bit)
{
@ -862,7 +877,9 @@ namespace std
if (__ix == __iy)
return strong_ordering::equal; // All bits are equal, we're done.
#ifdef __cpp_using_enum
using enum _Fp_fmt;
#endif
constexpr auto __fmt = _S_fp_fmt<_Tp>();
if constexpr (__fmt == _Dbldbl) // double-double