Revert addition of feature macros from other headers per latest SD-6.

2015-05-02  Edward Smith-Rowland  <3dw4rd@verizon.net>

        Revert addition of feature macros from other headers per latest SD-6.
        * include/experimental/deque: Remove feature-test macro.
        * include/experimental/forward_list: Ditto.
        * include/experimental/list: Ditto.
        * include/experimental/map: Ditto.
        * include/experimental/set: Ditto.
        * include/experimental/string: Ditto.
        * include/experimental/unordered_map: Ditto.
        * include/experimental/unordered_set: Ditto.

From-SVN: r222722

9 files changed, 12 insertions, 16 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9ebae19..09b4652 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2015-05-02  Edward Smith-Rowland  <3dw4rd@verizon.net>
+
+	Revert addition of feature macros from other headers per latest SD-6.
+        * include/experimental/deque: Remove feature-test macro.
+        * include/experimental/forward_list: Ditto.
+        * include/experimental/list: Ditto.
+        * include/experimental/map: Ditto.
+        * include/experimental/set: Ditto.
+        * include/experimental/string: Ditto.
+        * include/experimental/unordered_map: Ditto.
+        * include/experimental/unordered_set: Ditto.
+
 2015-05-02  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/experimental/any (any::_Storage): Make non-copyable.
diff --git a/libstdc++-v3/include/experimental/deque b/libstdc++-v3/include/experimental/deque
index 7561e89..8d3d895 100644
--- a/libstdc++-v3/include/experimental/deque
+++ b/libstdc++-v3/include/experimental/deque
@@ -46,8 +46,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _Tp, typename _Alloc, typename _Predicate>
     void
     erase_if(deque<_Tp, _Alloc>& __cont, _Predicate __pred)
diff --git a/libstdc++-v3/include/experimental/forward_list b/libstdc++-v3/include/experimental/forward_list
index 69719db..e7e6b33 100644
--- a/libstdc++-v3/include/experimental/forward_list
+++ b/libstdc++-v3/include/experimental/forward_list
@@ -45,8 +45,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _Tp, typename _Alloc, typename _Predicate>
     inline void 
     erase_if(forward_list<_Tp, _Alloc>& __cont, _Predicate __pred)
diff --git a/libstdc++-v3/include/experimental/list b/libstdc++-v3/include/experimental/list
index efd008b..41d6e1d 100644
--- a/libstdc++-v3/include/experimental/list
+++ b/libstdc++-v3/include/experimental/list
@@ -45,8 +45,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _Tp, typename _Alloc, typename _Predicate>
     inline void
     erase_if(list<_Tp, _Alloc>& __cont, _Predicate __pred)
diff --git a/libstdc++-v3/include/experimental/map b/libstdc++-v3/include/experimental/map
index 46db96353..e4b3620 100644
--- a/libstdc++-v3/include/experimental/map
+++ b/libstdc++-v3/include/experimental/map
@@ -46,8 +46,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _Key, typename _Tp, typename _Compare, typename _Alloc,
 	   typename _Predicate>
     inline void
diff --git a/libstdc++-v3/include/experimental/set b/libstdc++-v3/include/experimental/set
index 3fd184e..c742d91 100644
--- a/libstdc++-v3/include/experimental/set
+++ b/libstdc++-v3/include/experimental/set
@@ -46,8 +46,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _Key, typename _Compare, typename _Alloc,
 	   typename _Predicate>
     inline void
diff --git a/libstdc++-v3/include/experimental/string b/libstdc++-v3/include/experimental/string
index dddccf5..2a04ce0d 100644
--- a/libstdc++-v3/include/experimental/string
+++ b/libstdc++-v3/include/experimental/string
@@ -46,8 +46,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _CharT, typename _Traits, typename _Alloc,
 	   typename _Predicate>
     inline void
diff --git a/libstdc++-v3/include/experimental/unordered_map b/libstdc++-v3/include/experimental/unordered_map
index 10901c7..d3a578e 100644
--- a/libstdc++-v3/include/experimental/unordered_map
+++ b/libstdc++-v3/include/experimental/unordered_map
@@ -46,8 +46,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _Key, typename _Tp, typename _Hash, typename _CPred,
 	   typename _Alloc, typename _Predicate>
     inline void
diff --git a/libstdc++-v3/include/experimental/unordered_set b/libstdc++-v3/include/experimental/unordered_set
index 80719a1..2e5e08a 100644
--- a/libstdc++-v3/include/experimental/unordered_set
+++ b/libstdc++-v3/include/experimental/unordered_set
@@ -46,8 +46,6 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_experimental_erase_if 201411
-
   template<typename _Key, typename _Hash, typename _CPred, typename _Alloc,
 	   typename _Predicate>
     inline void