TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 14:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Fix -Wshift-count-overflow warning in std::bitset

Browse Source 
This shift only happens if the unsigned long long type is wider than
unsigned long but the compiler warns when it sees the shift, without
caring if it's reachable.

Use the preprocessor to compare the sizes and just reuse _M_to_ulong()
if sizeof(long) == sizeof(long long).

libstdc++-v3/ChangeLog:

	* include/std/bitset (_Base_bitset::_M_do_to_ullong): Avoid
	-Wshift-count-overflow warning.
This commit is contained in:
Jonathan Wakely
2024-01-20 21:09:28 +00:00
parent 924137b901
commit 86302e1a76
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libstdc++-v3/include/std/bitset
View File

@@ -320,17 +320,18 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
_GLIBCXX14_CONSTEXPR unsigned long long
_Base_bitset<_Nw>::_M_do_to_ullong() const
{
const bool __dw = sizeof(unsigned long long) > sizeof(unsigned long);
for (size_t __i = 1 + __dw; __i < _Nw; ++__i)
#if __SIZEOF_LONG_LONG__ == __SIZEOF_LONG__
return _M_do_to_ulong();
#else
for (size_t __i = 2; __i < _Nw; ++__i)
if (_M_w[__i])
__throw_overflow_error(__N("_Base_bitset::_M_do_to_ullong"));
if (__dw)
return _M_w[0] + (static_cast<unsigned long long>(_M_w[1])
return _M_w[0] + (static_cast<unsigned long long>(_M_w[1])
<< _GLIBCXX_BITSET_BITS_PER_WORD);
return _M_w[0];
}
#endif
}
#endif // C++11
template<size_t _Nw>
_GLIBCXX14_CONSTEXPR size_t