diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2019-10-03 14:35:35 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2019-10-03 14:35:35 +0000 |
| commit | ebf8247e7b8d944e75ebcb406a992b24425fc712 (patch) | |
| tree | 3dbf1092e91baac20d4bd1bb963649e0255cd137 | |
| parent | a164d19acb50f67c2b39ab394f8c8e4b6ea9114b (diff) | |
| download | gcc-ebf8247e7b8d944e75ebcb406a992b24425fc712.zip gcc-ebf8247e7b8d944e75ebcb406a992b24425fc712.tar.gz gcc-ebf8247e7b8d944e75ebcb406a992b24425fc712.tar.bz2 | |
Avoid reserved identifier in include/parallel/multiway_merge.h
* include/parallel/multiway_merge.h (_RAIter3): Replace _C by _Cp.
From-SVN: r276515
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/multiway_merge.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2474a69..7beb037 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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. diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h index c5f8588..63ad274 100644 --- a/libstdc++-v3/include/parallel/multiway_merge.h +++ b/libstdc++-v3/include/parallel/multiway_merge.h @@ -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, |