From: ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 3 Oct 2019 14:35:35 +0000 (+0000)
Subject: Avoid reserved identifier in include/parallel/multiway_merge.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a41b014a1e9743557535027d417d69277d8a7e;p=thirdparty%2Fgcc.git

Avoid reserved identifier in include/parallel/multiway_merge.h

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276515 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2474a69e8054..7beb037110d8 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 c5f85881acee..63ad27403c6b 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,