rename local _C2 identifiers in stl map header files

2020-01-09  Olivier Hainque  <hainque@adacore.com>

	* doc/xml/manual/appendix_contributing.xml: Document _C2
	as a reserved identifier, by VxWorks.
	* include/bits/stl_map.h: Rename _C2 template typenames	as _Cmp2.
	* include/bits/stl_multimap.h: Likewise.

From-SVN: r280076

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 65cd480ddcc69710390ed93b99096cebf619095d..536eb74ba798be7c124108c8b9313bbbe63d8c2f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2020-01-09  Olivier Hainque  <hainque@adacore.com>
+
+       * doc/xml/manual/appendix_contributing.xml: Document _C2
+       as a reserved identifier, by VxWorks.
+       * include/bits/stl_map.h: Rename _C2 template typenames as _Cmp2.
+       * include/bits/stl_multimap.h: Likewise.
+
 2020-01-09  Jonathan Wakely  <jwakely@redhat.com>
 
        * include/ext/extptr_allocator.h (_ExtPtr_allocator::operator==)

diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index 3e10e1b5e5c06171419ef80b86833a472ce7037d..b399e71d48293fdcd9060259c3ac0c990c6616d4 100644 (file)
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -463,6 +463,9 @@ indicate a place that may require attention for multi-thread safety.
       _res_ext
       __tg_*
 
+      VxWorks adds:
+      _C2
+
       For GCC:
 
       [Note that this list is out of date. It applies to the old

diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 4e4b82f5217f5dd5a6adfbf3ada6e2486f1deb26..fe930c15757aeed4f78020605098cab0f4e44708 100644 (file)
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -637,30 +637,30 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       template<typename, typename>
        friend class std::_Rb_tree_merge_helper;
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(map<_Key, _Tp, _C2, _Alloc>& __source)
+       merge(map<_Key, _Tp, _Cmp2, _Alloc>& __source)
        {
-         using _Merge_helper = _Rb_tree_merge_helper<map, _C2>;
+         using _Merge_helper = _Rb_tree_merge_helper<map, _Cmp2>;
          _M_t._M_merge_unique(_Merge_helper::_S_get_tree(__source));
        }
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(map<_Key, _Tp, _C2, _Alloc>&& __source)
+       merge(map<_Key, _Tp, _Cmp2, _Alloc>&& __source)
        { merge(__source); }
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(multimap<_Key, _Tp, _C2, _Alloc>& __source)
+       merge(multimap<_Key, _Tp, _Cmp2, _Alloc>& __source)
        {
-         using _Merge_helper = _Rb_tree_merge_helper<map, _C2>;
+         using _Merge_helper = _Rb_tree_merge_helper<map, _Cmp2>;
          _M_t._M_merge_unique(_Merge_helper::_S_get_tree(__source));
        }
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(multimap<_Key, _Tp, _C2, _Alloc>&& __source)
+       merge(multimap<_Key, _Tp, _Cmp2, _Alloc>&& __source)
        { merge(__source); }
 #endif // C++17
 

diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h
index 48f577887985c99fa0b84c66bedec96212c8d97a..d38f530e123ddeb154da2d1426715c8adcc6e757 100644 (file)
--- a/libstdc++-v3/include/bits/stl_multimap.h
+++ b/libstdc++-v3/include/bits/stl_multimap.h
@@ -653,30 +653,30 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       template<typename, typename>
        friend class std::_Rb_tree_merge_helper;
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(multimap<_Key, _Tp, _C2, _Alloc>& __source)
+       merge(multimap<_Key, _Tp, _Cmp2, _Alloc>& __source)
        {
-         using _Merge_helper = _Rb_tree_merge_helper<multimap, _C2>;
+         using _Merge_helper = _Rb_tree_merge_helper<multimap, _Cmp2>;
          _M_t._M_merge_equal(_Merge_helper::_S_get_tree(__source));
        }
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(multimap<_Key, _Tp, _C2, _Alloc>&& __source)
+       merge(multimap<_Key, _Tp, _Cmp2, _Alloc>&& __source)
        { merge(__source); }
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(map<_Key, _Tp, _C2, _Alloc>& __source)
+       merge(map<_Key, _Tp, _Cmp2, _Alloc>& __source)
        {
-         using _Merge_helper = _Rb_tree_merge_helper<multimap, _C2>;
+         using _Merge_helper = _Rb_tree_merge_helper<multimap, _Cmp2>;
          _M_t._M_merge_equal(_Merge_helper::_S_get_tree(__source));
        }
 
-      template<typename _C2>
+      template<typename _Cmp2>
        void
-       merge(map<_Key, _Tp, _C2, _Alloc>&& __source)
+       merge(map<_Key, _Tp, _Cmp2, _Alloc>&& __source)
        { merge(__source); }
 #endif // C++17