procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid reserved identifier in include/parallel/multiway_merge.h

Browse source 
* include/parallel/multiway_merge.h (_RAIter3): Replace _C by _Cp.

From-SVN: r276515
This commit is contained in:
Rainer Orth 2019-10-03 14:35:35 +00:00 • committed by Rainer Orth
parent a164d19acb
commit ebf8247e7b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,7 @@
2019-10-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* include/parallel/multiway_merge.h (_RAIter3): Replace _C by _Cp.
2019-10-02 Jonathan Wakely <jwakely@redhat.com>
* config/abi/pre/gnu.ver: Tighten up greedy wildcards.

4
libstdc++-v3/include/parallel/multiway_merge.h
View file

@ -232,7 +232,7 @@ namespace __gnu_parallel
*
* @return End iterator of output sequence.
*/
template<template<typename _RAI, typename _C> class iterator,
template<template<typename _RAI, typename _Cp> class iterator,
typename _RAIterIterator,
typename _RAIter3,
typename _DifferenceTp,
@ -351,7 +351,7 @@ namespace __gnu_parallel
*
* @return End iterator of output sequence.
*/
template<template<typename _RAI, typename _C> class iterator,
template<template<typename _RAI, typename _Cp> class iterator,
typename _RAIterIterator,
typename _RAIter3,
typename _DifferenceTp,