This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[patch] Add SD-6 features test macros for recent libstdc++ changes
- From: Jonathan Wakely <jwakely at redhat dot com>
- To: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Thu, 13 Aug 2015 14:48:54 +0100
- Subject: [patch] Add SD-6 features test macros for recent libstdc++ changes
- Authentication-results: sourceware.org; auth=none
Subject says it all.
Tested ppc64le-linux, committing to trunk.
commit d7f997a59a1383b7f08618fbf1d7855edb5fa012
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Aug 13 10:27:59 2015 +0100
* include/bits/alloc_traits.h: Add feature-test macro.
* include/bits/allocator.h: Likewise.
* include/bits/range_access.h: Likewise.
* include/bits/stl_map.h: Likewise.
* include/bits/unordered_map.h: Likewise.
diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h
index e5ed92b..565b89b 100644
--- a/libstdc++-v3/include/bits/alloc_traits.h
+++ b/libstdc++-v3/include/bits/alloc_traits.h
@@ -36,6 +36,8 @@
#include <bits/ptr_traits.h>
#include <ext/numeric_traits.h>
+#define __cpp_lib_allocator_traits_is_always_equal 201411
+
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index c7a2503..6fd3214 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -78,6 +78,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// 2103. std::allocator propagate_on_container_move_assignment
typedef true_type propagate_on_container_move_assignment;
+#define __cpp_lib_allocator_is_always_equal 201411
typedef true_type is_always_equal;
#endif
};
diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h
index 586d162..aa78afb 100644
--- a/libstdc++-v3/include/bits/range_access.h
+++ b/libstdc++-v3/include/bits/range_access.h
@@ -223,6 +223,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif // C++14
#if __cplusplus > 201402L
+#define __cpp_lib_nonmember_container_access 201411
/**
* @brief Return the size of a container.
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 68ab6da..dff9f9c 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -591,7 +591,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
std::forward<_Args>(__args)...);
}
#endif
+
#if __cplusplus > 201402L
+#define __cpp_lib_map_try_emplace 201411
/**
* @brief Attempts to build and insert a std::pair into the %map.
*
@@ -708,6 +710,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
return __i;
}
#endif
+
/**
* @brief Attempts to insert a std::pair into the %map.
@@ -805,6 +808,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
{ _M_t._M_insert_unique(__first, __last); }
#if __cplusplus > 201402L
+#define __cpp_lib_map_insertion 201411
/**
* @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 15d4b8b..1b90459 100644
--- a/libstdc++-v3/include/bits/unordered_map.h
+++ b/libstdc++-v3/include/bits/unordered_map.h
@@ -412,6 +412,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus > 201402L
+#define __cpp_lib_unordered_map_try_emplace 201411
/**
* @brief Attempts to build and insert a std::pair into the
* %unordered_map.
@@ -617,6 +618,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus > 201402L
+#define __cpp_lib_unordered_map_insertion 201411
/**
* @brief Attempts to insert a std::pair into the %unordered_map.
* @param __k Key to use for finding a possibly existing pair in