OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Replace use of reserved name that clashes [PR 97362] 

The name __deref is defined as a macro by Windows headers.

This renames the __deref() helper function to __ref. It doesn't actually
dereference an iterator. it just has the same type as the iterator's
reference type.

libstdc++-v3/ChangeLog:

	PR libstdc++/97362
	* doc/html/manual/source_code_style.html: Regenerate.
	* doc/xml/manual/appendix_contributing.xml: Add __deref to
	BADNAMES.
	* include/debug/functions.h (_Irreflexive_checker::__deref):
	Rename to __ref.
	* testsuite/17_intro/badnames.cc: Check __deref.
This commit is contained in:
Jonathan Wakely 2020-10-10 21:22:12 +01:00
parent 988f0466e8
commit 2137aa9241
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libstdc++-v3/doc/html/manual/source_code_style.html
View File

@ -32,6 +32,7 @@
<br />
      MS adds:<br />
      _T<br />
__deref<br />
<br />
      BSD adds:<br />
      __used<br />

6
libstdc++-v3/doc/xml/manual/appendix_contributing.xml
View File

@ -412,8 +412,9 @@ indicate a place that may require attention for multi-thread safety.
<para>
</para>
<section xml:id="coding_style.bad_identifiers"><info><title>Bad Identifiers</title></info>
<section xml:id="coding_style.bad_identifiers"><info><title>Bad Identifiers</title></info> <!-- BADNAMES -->
<para>
Identifiers that conflict and should be avoided.
</para>
@ -445,6 +446,7 @@ indicate a place that may require attention for multi-thread safety.
MS adds:
_T
__deref
BSD adds:
__used

6
libstdc++-v3/include/debug/functions.h
View File

@ -421,10 +421,10 @@ namespace __gnu_debug
{
template<typename _It>
static typename std::iterator_traits<_It>::reference
__deref();
__ref();
template<typename _It,
typename = decltype(__deref<_It>() < __deref<_It>())>
typename = decltype(__ref<_It>() < __ref<_It>())>
_GLIBCXX20_CONSTEXPR
static bool
_S_is_valid(_It __it)
@ -438,7 +438,7 @@ namespace __gnu_debug
{ return true; }
template<typename _It, typename _Pred, typename
= decltype(std::declval<_Pred>()(__deref<_It>(), __deref<_It>()))>
= decltype(std::declval<_Pred>()(__ref<_It>(), __ref<_It>()))>
_GLIBCXX20_CONSTEXPR
static bool
_S_is_valid_pred(_It __it, _Pred __pred)

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

@ -62,6 +62,7 @@
// MS adds:
#define _T _T is a BADNAME
#define __deref __deref is a BADNAME
// BSD adds:
#define __used __used is a BADNAME