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

libstdc++: Do not use __used or __packed as identifiers

Browse Source 
These names (and __unused) are defined as macros by newlib.

libstdc++-v3/ChangeLog:

	* include/std/format: Rename all variables called __used or
	__packed.
	* testsuite/17_intro/badnames.cc: Add no_pch options.
	* testsuite/17_intro/names.cc: Check __packed, __unused and
	__used.
This commit is contained in:
Jonathan Wakely 2022-11-28 20:48:55 +00:00
parent 36cabc257d
commit 0ded30b361
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libstdc++-v3/include/std/format
View File

@ -2472,21 +2472,21 @@ namespace __format
void
_M_overflow() override
{
auto __used = this->_M_used();
auto __s = this->_M_used();
if (_M_max < 0) // No maximum.
_M_out = ranges::copy(__used, std::move(_M_out)).out;
_M_out = ranges::copy(__s, std::move(_M_out)).out;
else if (_M_count < size_t(_M_max))
{
auto __max = _M_max - _M_count;
span<_CharT> __first;
if (__max < __used.size())
__first = __used.first(__max);
if (__max < __s.size())
__first = __s.first(__max);
else
__first = __used;
__first = __s;
_M_out = ranges::copy(__first, std::move(_M_out)).out;
}
this->_M_rewind();
_M_count += __used.size();
_M_count += __s.size();
}
public:
@ -2529,8 +2529,8 @@ namespace __format
void
_M_overflow()
{
auto __used = this->_M_used();
_M_count += __used.size();
auto __s = this->_M_used();
_M_count += __s.size();
if (_M_max >= 0)
{
@ -2544,7 +2544,7 @@ namespace __format
{
// No maximum character count. Just extend the span to allow
// writing more characters to it.
this->_M_reset({__used.data(), __used.size() + 1024}, __used.end());
this->_M_reset({__s.data(), __s.size() + 1024}, __s.end());
}
}
@ -2594,12 +2594,12 @@ namespace __format
{
_Iter_sink::_M_overflow();
iter_difference_t<_OutIter> __count(_M_count);
auto __used = this->_M_used();
auto __s = this->_M_used();
auto __last = _M_first;
if (__used.data() == _M_buf) // Wrote at least _M_max characters.
if (__s.data() == _M_buf) // Wrote at least _M_max characters.
__last += _M_max;
else
__last += iter_difference_t<_OutIter>(__used.size());
__last += iter_difference_t<_OutIter>(__s.size());
return { __last, __count };
}
};
@ -3119,10 +3119,10 @@ namespace __format
constexpr auto
__pack_arg_types(const array<_Arg_t, _Nm>& __types)
{
__UINT64_TYPE__ __packed = 0;
__UINT64_TYPE__ __packed_types = 0;
for (auto __i = __types.rbegin(); __i != __types.rend(); ++__i)
__packed = (__packed << _Bits) | *__i;
return __packed;
__packed_types = (__packed_types << _Bits) | *__i;
return __packed_types;
}
} // namespace __format
/// @endcond

1
libstdc++-v3/testsuite/17_intro/badnames.cc
View File

@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile { target x86_64-*-linux* } }
// { dg-add-options no_pch }
// Names taken from coding_style.bad_identifiers in the libstdc++ manual.
// We can't test this on all targets, because these names are used in

10
libstdc++-v3/testsuite/17_intro/names.cc
View File

@ -129,8 +129,11 @@
#define ptr (
#endif
// This clashes with newlib so don't use it.
// These clash with newlib so don't use them.
# define __lockable cannot be used as an identifier
# define __packed cannot be used as an identifier
# define __unused cannot be used as an identifier
# define __used cannot be used as an identifier
#ifndef __APPLE__
#define __weak predefined qualifier on darwin
@ -239,8 +242,11 @@
#endif
#if __has_include(<newlib.h>)
// newlib's <sys/cdefs.h> defines __lockable as a macro.
// newlib's <sys/cdefs.h> defines these as macros.
#undef __lockable
#undef __packed
#undef __unused
#undef __used
// newlib's <time.h> defines __tzrule_type with these members.
#undef d
#undef m