From e9e98aaa59e763878aee9558ad9172c146f6da13 Mon Sep 17 00:00:00 2001
From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 5 Jun 2010 17:47:04 +0000
Subject: [PATCH] 2010-06-05  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* doc/xml/manual/status_cxx200x.xml: Update.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160325 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog                         | 23 +++++++++++++++++++++++
 libstdc++-v3/doc/xml/manual/status_cxx200x.xml |  9 +++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 03b1d64f30f..050478f69ce 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,26 @@
+2010-06-05  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* doc/xml/manual/status_cxx200x.xml: Update.
+
+2010-06-05  Magnus Fromreide  <magfr@lysator.liu.se>
+            Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/std/functional (function): Add nullptr_t support.
+	* include/bits/shared_ptr.h (shared_ptr): Likewise.
+	* include/bits/unique_ptr.h (unique_ptr): Likewise.
+
+2010-06-05  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/bits/shared_ptr_base.h (__shared_ptr): Add nullptr_t support.
+	(__shared_count): Add nullptr_t support and make constructors explicit.
+	* testsuite/20_util/shared_ptr/cons/43820.cc: Adjust.
+	* testsuite/20_util/shared_ptr/cons/nullptr.cc: New.
+	* testsuite/20_util/unique_ptr/cons/nullptr.cc: New.
+	* testsuite/20_util/unique_ptr/assign/nullptr.cc: New.
+	* testsuite/20_util/unique_ptr/assign/assign_neg.cc: Adjust.
+	* testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Adjust.
+	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust.
+
 2010-06-04  Jason Merrill  <jason@redhat.com>
 
 	* testsuite/util/testsuite_abi.h: Work around glibc BZ 9694.
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx200x.xml b/libstdc++-v3/doc/xml/manual/status_cxx200x.xml
index d6a73e94a7b..718e47bb098 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx200x.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx200x.xml
@@ -82,7 +82,7 @@ particular release.
       <entry>18.2</entry>
       <entry>Types</entry>
       <entry>Partial</entry>
-      <entry>Missing offsetof, max_align_t, nullptr_t</entry>
+      <entry>Missing offsetof, max_align_t</entry>
     </row>
     <row>
       <entry>18.3</entry>
@@ -519,7 +519,7 @@ particular release.
       <entry>20.7.4.3</entry>
       <entry>Type properties</entry>
       <entry>Partial</entry>
-      <entry>Missing is_system_layout</entry>
+      <entry>Missing is_trivially_copyable, is_literal_type, is_nothrow_constructible</entry>
     </row>
     <row>
       <entry>20.7.5</entry>
@@ -2236,10 +2236,11 @@ particular release.
       <entry></entry>
     </row>
     <row>
+      <?dbhtml bgcolor="#B0B0B0" ?>
       <entry>30.3.1</entry>
       <entry>Class <code>thread</code></entry>
-      <entry>Y</entry>
-      <entry></entry>
+      <entry>Partial</entry>
+      <entry><code>thread::id</code> is not trivially copyable</entry>
     </row>
     <row>
       <entry>30.3.2</entry>
-- 
2.11.0