[PATCH] Fix non-reserved names in Parallel Mode headers

[Rainer Orth]

Hi Jonathan,

> 	* include/parallel/algo.h: Replace non-reserved names.
> 	* include/parallel/multiway_merge.h: Likewise.
> 	* include/parallel/multiway_mergesort.h: Likewise.
> 	* include/parallel/numericfwd.h: Likewise.
> 	* testsuite/17_intro/names.cc: Add RAI to test macros.
>
> Tested x86_64-linux (normal and parallel modes), committed to trunk.

this patch causes some failures on Solaris:

+FAIL: 17_intro/headers/c++2011/parallel_mode.cc (test for excess errors)
+FAIL: 17_intro/headers/c++2014/parallel_mode.cc (test for excess errors)
+FAIL: 17_intro/headers/c++2017/parallel_mode.cc (test for excess errors)

Excess errors:
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:235: error: expected nested-name-specifier before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:235: error: expected '>' before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:235: error: expected 'class' or 'typename' before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:235: error: expected identifier before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:235: error: expected '>' before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:235: error: expected ';' before ',' token
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:354: error: expected nested-name-specifier before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:354: error: expected '>' before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:354: error: expected 'class' or 'typename' before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:354: error: expected identifier before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:354: error: expected '>' before numeric constant
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:354: error: expected ';' before ',' token
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:759: error: 'multiway_merge_3_variant' was not declared in this scope
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:759: error: missing template arguments before '>' token
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:781: error: 'multiway_merge_3_variant' was not declared in this scope
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:781: error: missing template arguments before '>' token
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:802: error: 'multiway_merge_4_variant' was not declared in this scope
/var/gcc/regression/trunk/11.5-gcc/build/i386-pc-solaris2.11/libstdc++-v3/include/parallel/multiway_merge.h:802: error: missing template arguments before '>' token

because ...

> diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h
> index 6bdf08b4704..c5f85881ace 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 _C> 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 _C> class iterator,
>             typename _RAIterIterator,
>             typename _RAIter3,
>             typename _DifferenceTp,

_C is used in <ctype.h>.  Fixed as in other similar instances, tested on
i386-pc-solaris2.11.  Ok for mainline?

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University


2019-10-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: sol2-v3-multiway_merge-_C.patch
Type: text/x-patch
Size: 1033 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/libstdc++/attachments/20191003/174139f1/attachment.bin>