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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9ebae195eda39b70ddfb525230d9859cabb23466..09b465216056cae61f1b89a48b97c5ac3ccd80c6 100644 (file)
--- 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 7561e8955669450efba3bbe9c93a392428b82d6e..8d3d8951e3a0be3f669b8c0aa8599dbe32e6ce68 100644 (file)
--- 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 69719db62e5b740702eeed325b83087f9746696b..e7e6b33bd0010d1c192f2c981e539c571ba16a6b 100644 (file)
--- 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 efd008b3a1cd0c400d37d7cc0f4b90de6562e457..41d6e1dcbdcad6415b45645760673e365f691d33 100644 (file)
--- 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 46db963530aaffdbf0abfc69d00c3b1f43840f18..e4b3620e6717b171dee68a70e9cdb7ef995a917c 100644 (file)
--- 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 3fd184ec80f748f74c968926d34456ded080dc15..c742d9187f51330a1ec4a6fdd4b36089fc299a34 100644 (file)
--- 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 dddccf59b56faa9534b78bf5a79eb06c141b3449..2a04ce0d72d985034026bab8af56210552ac98e1 100644 (file)
--- 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 10901c7c4b8c745a0b5e6874b1d38fd81f4b8066..d3a578efe3af30aec9302f390defad5a65f4b4a4 100644 (file)
--- 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 80719a177bc107e62b393888087d11a963671576..2e5e08a9609f0bd6350587304e4e427b1ecafb67 100644 (file)
--- 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