aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2015-08-13 14:57:41 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2015-08-13 14:57:41 +0100
commitdb23e4c46f7f4ccc0b72de142205aadc934f3a00 (patch)
tree7ddb6d2580df8eea202d89a626ffef73f674e751
parent0072c9ac909191c5709585e3882bbab8749c8b9c (diff)
downloadgcc-db23e4c46f7f4ccc0b72de142205aadc934f3a00.zip
gcc-db23e4c46f7f4ccc0b72de142205aadc934f3a00.tar.gz
gcc-db23e4c46f7f4ccc0b72de142205aadc934f3a00.tar.bz2
alloc_traits.h: Add feature-test macro.
* 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. From-SVN: r226864
-rw-r--r--libstdc++-v3/ChangeLog8
-rw-r--r--libstdc++-v3/include/bits/alloc_traits.h2
-rw-r--r--libstdc++-v3/include/bits/allocator.h1
-rw-r--r--libstdc++-v3/include/bits/range_access.h1
-rw-r--r--libstdc++-v3/include/bits/stl_map.h4
-rw-r--r--libstdc++-v3/include/bits/unordered_map.h2
6 files changed, 18 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6870f71..13b83da 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,13 @@
2015-08-13 Jonathan Wakely <jwakely@redhat.com>
+ * 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.
+
+2015-08-13 Jonathan Wakely <jwakely@redhat.com>
+
* testsuite/30_threads/mutex/unlock/2.cc: New.
* testsuite/30_threads/recursive_mutex/unlock/2.cc: New.
* testsuite/30_threads/recursive_timed_mutex/unlock/2.cc: New.
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