[gcc(refs/vendors/ibm/heads/gcc-9-branch)] libstdc++: Add comments to non-standard feature test macros

[gcc(refs/vendors/ibm/heads/gcc-9-branch)] libstdc++: Add comments to non-standard feature test macros

[Peter Bergner]

https://gcc.gnu.org/g:152d89e33d7cb84c2a1b78e58d10ad6873168c96

commit 152d89e33d7cb84c2a1b78e58d10ad6873168c96
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Apr 23 17:26:26 2020 +0100

    libstdc++: Add comments to non-standard feature test macros
    
    These macros were replaced by __cpp_lib_map_try_emplace and
    __cpp_lib_unordered_map_try_emplace, because those names are more
    descriptive. The old names have been removed for gcc-10, but for this
    branch just add comments noting they are non-standard.
    
            * include/bits/stl_map.h (__cpp_lib_map_insertion): Add comment to
            non-standard macro.
            * include/bits/unordered_map.h (__cpp_lib_unordered_map_insertion):
            Likewise.
            * include/std/version (__cpp_lib_map_insertion)
            (__cpp_lib_unordered_map_insertion): Likewise.

Diff:
---
 libstdc++-v3/ChangeLog                    | 7 +++++++
 libstdc++-v3/include/bits/stl_map.h       | 2 +-
 libstdc++-v3/include/bits/unordered_map.h | 2 +-
 libstdc++-v3/include/std/version          | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2c01ae9377a..a481c9f7950 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2020-04-23  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/bits/stl_map.h (__cpp_lib_map_insertion): Add comment to
+	non-standard macro.
+	* include/bits/unordered_map.h (__cpp_lib_unordered_map_insertion):
+	Likewise.
+	* include/std/version (__cpp_lib_map_insertion)
+	(__cpp_lib_unordered_map_insertion): Likewise.
+
 	* include/std/bit (__cpp_lib_int_pow2): Define to indicate P0556R3
 	support.
 	* include/std/version (__cpp_lib_int_pow2): Likewise.
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 322d0a8290a..a87bba83c0d 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -892,7 +892,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 	{ _M_t._M_insert_range_unique(__first, __last); }
 
 #if __cplusplus > 201402L
-#define __cpp_lib_map_insertion 201411
+#define __cpp_lib_map_insertion 201411 // non-standard macro
       /**
        *  @brief Attempts to insert or assign a std::pair into the %map.
        *  @param __k    Key to use for finding a possibly existing pair in
diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h
index b8243a73445..9959c39d083 100644
--- a/libstdc++-v3/include/bits/unordered_map.h
+++ b/libstdc++-v3/include/bits/unordered_map.h
@@ -657,7 +657,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
 
 #if __cplusplus > 201402L
-#define __cpp_lib_unordered_map_insertion 201411
+#define __cpp_lib_unordered_map_insertion 201411 // non-standard macro
       /**
        *  @brief Attempts to insert a std::pair into the %unordered_map.
        *  @param __k    Key to use for finding a possibly existing pair in
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index 830b8172e56..a37ee0d5072 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -134,7 +134,7 @@
 #define __cpp_lib_invoke 201411
 #define __cpp_lib_lcm 201606
 #define __cpp_lib_make_from_tuple 201606
-#define __cpp_lib_map_insertion 201411
+#define __cpp_lib_map_insertion 201411  // non-standard macro
 #define __cpp_lib_map_try_emplace 201411
 #define __cpp_lib_math_special_functions 201603L
 #ifdef _GLIBCXX_HAS_GTHREADS
@@ -155,7 +155,7 @@
 #define __cpp_lib_shared_ptr_weak_type 201606
 #define __cpp_lib_string_view 201603
 // #define __cpp_lib_to_chars 201611L
-#define __cpp_lib_unordered_map_insertion 201411
+#define __cpp_lib_unordered_map_insertion 201411  // non-standard macro
 #define __cpp_lib_unordered_map_try_emplace 201411
 #define __cpp_lib_variant 201606L
 #define __cpp_lib_parallel_algorithm 201603L