From f22ee6896d6ceb0af8b3c1eabca90430b37f3680 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Thu, 20 Jan 2011 20:18:29 +0000
Subject: [PATCH] re PR libstdc++/47380 (concept checking and incomplete types)

2011-01-20  Jonathan Wakely  <jwakely.gcc@gmail.com>

        PR libstdc++/47380
	* doc/xml/manual/diagnostics.xml: Replace note about C++0x concepts.

From-SVN: r169064
---
 libstdc++-v3/ChangeLog                      |  4 ++++
 libstdc++-v3/doc/xml/manual/diagnostics.xml | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5de3330bc79..d1ce8ed6cf6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-20  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* doc/xml/manual/diagnostics.xml: Replace note about C++0x concepts.
+
 2011-01-20  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/36104 part three
diff --git a/libstdc++-v3/doc/xml/manual/diagnostics.xml b/libstdc++-v3/doc/xml/manual/diagnostics.xml
index b9a7048716f..1a6a3f17dc2 100644
--- a/libstdc++-v3/doc/xml/manual/diagnostics.xml
+++ b/libstdc++-v3/doc/xml/manual/diagnostics.xml
@@ -95,7 +95,7 @@
    </para>
    <para>
      The primary author of the checking code, Jeremy Siek, had already
-     started work on a replacement implementation.  The new code has been
+     started work on a replacement implementation.  The new code was
      formally reviewed and accepted into
    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.boost.org/libs/concept_check/concept_check.htm">the
    Boost libraries</link>, and we are pleased to incorporate it into the
@@ -116,10 +116,12 @@
  </para>
 
  <para>
-   Please note that the upcoming C++ standard has first-class
-   support for template parameter constraints based on concepts in the core
-   language. This will obviate the need for the library-simulated concept
-   checking described above.
+   Please note that the checks are based on the requirements in the original
+   C++ standard, some of which have changed in the upcoming C++0x revision.
+   Additionally, some correct code might be rejected by the concept checks,
+   for example template argument types may need to be complete when used in
+   a template definition, rather than at the point of instantiation.
+   There are no plans to address these shortcomings.
  </para>
 
 </section>
-- 
2.30.2