From 64b07900f168ccab6ba336033daa61b71c00887c Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 1 May 2015 22:01:17 +0100
Subject: [PATCH] memory: Add feature-test macro.

	* include/experimental/memory: Add feature-test macro.
	* include/experimental/vector: Likewise.
	* doc/xml/manual/status_cxx2017.xml: Update status.
	* doc/html/manual/status.html: Regenerate.

From-SVN: r222707
---
 libstdc++-v3/ChangeLog                         | 7 +++++++
 libstdc++-v3/doc/html/manual/status.html       | 4 ++--
 libstdc++-v3/doc/xml/manual/status_cxx2017.xml | 3 +--
 libstdc++-v3/include/experimental/memory       | 2 ++
 libstdc++-v3/include/experimental/vector       | 2 ++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a899842223c..e1aae8038f0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-01  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/experimental/memory: Add feature-test macro.
+	* include/experimental/vector: Likewise.
+	* doc/xml/manual/status_cxx2017.xml: Update status.
+	* doc/html/manual/status.html: Regenerate.
+
 2015-05-01  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	Implement observer_ptr.
diff --git a/libstdc++-v3/doc/html/manual/status.html b/libstdc++-v3/doc/html/manual/status.html
index 6bd6c508431..3a9bf218273 100644
--- a/libstdc++-v3/doc/html/manual/status.html
+++ b/libstdc++-v3/doc/html/manual/status.html
@@ -524,11 +524,11 @@ not in any particular release.
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4257.html" target="_top">
 	  N4257
 	</a>
-      </td><td align="left">Delimited iterators</td><td align="left">N</td><td align="left">Library Fundamentals 2 TS</td></tr><tr bgcolor="#C8B0B0"><td align="left">
+      </td><td align="left">Delimited iterators</td><td align="left">N</td><td align="left">Library Fundamentals 2 TS</td></tr><tr><td align="left">
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4282.pdf" target="_top">
 	  N4282
 	</a>
-      </td><td align="left">The World's Dumbest Smart Pointer</td><td align="left">N</td><td align="left">Library Fundamentals 2 TS</td></tr></tbody></table></div></div><br class="table-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="status.iso.tr1"></a>C++ TR1</h3></div></div></div><p>
+      </td><td align="left">The World's Dumbest Smart Pointer</td><td align="left">Y</td><td align="left">Library Fundamentals 2 TS</td></tr></tbody></table></div></div><br class="table-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="status.iso.tr1"></a>C++ TR1</h3></div></div></div><p>
 This table is based on the table of contents of ISO/IEC DTR 19768
 Doc No: N1836=05-0096 Date: 2005-06-24
 Draft Technical Report on C++ Library Extensions
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
index b08e1b12229..80dd050ccab 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
@@ -233,14 +233,13 @@ not in any particular release.
     </row>
 
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>
 	<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4282.pdf">
 	  N4282
 	</link>
       </entry>
       <entry>The World's Dumbest Smart Pointer</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry>Library Fundamentals 2 TS</entry>
     </row>
 
diff --git a/libstdc++-v3/include/experimental/memory b/libstdc++-v3/include/experimental/memory
index d3c95094ea9..f43621f53c5 100644
--- a/libstdc++-v3/include/experimental/memory
+++ b/libstdc++-v3/include/experimental/memory
@@ -52,6 +52,8 @@ inline namespace fundamentals_v2
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
+#define __cpp_lib_experimental_not_fn 201411
+
   template <typename _Tp>
     class observer_ptr
     {
diff --git a/libstdc++-v3/include/experimental/vector b/libstdc++-v3/include/experimental/vector
index 245e0340fd8..37645a144ca 100644
--- a/libstdc++-v3/include/experimental/vector
+++ b/libstdc++-v3/include/experimental/vector
@@ -46,6 +46,8 @@ 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(vector<_Tp, _Alloc>& __cont, _Predicate __pred)
-- 
2.30.2