2004-03-08 Paolo Carlini <pcarlini@suse.de>

	* docs/html/ext/howto.html: Add entry for DR 103 [WP].
	* include/bits/stl_multiset.h: Add comment about DR 103.
	* include/bits/stl_set.h: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79114 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b105ada..5b1492b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2004-03-08  Paolo Carlini  <pcarlini@suse.de>
 
+       * docs/html/ext/howto.html: Add entry for DR 103 [WP].
+       * include/bits/stl_multiset.h: Add comment about DR 103.
+       * include/bits/stl_set.h: Likewise.
+
+2004-03-08  Paolo Carlini  <pcarlini@suse.de>
+
        * include/bits/locale_facets.tcc (money_get<>::_M_extract):
        The value _space_ indicates that at least one space is required
        at that position.

diff --git a/libstdc++-v3/docs/html/ext/howto.html b/libstdc++-v3/docs/html/ext/howto.html
index 41fe10b..682b34e 100644 (file)
--- a/libstdc++-v3/docs/html/ext/howto.html
+++ b/libstdc++-v3/docs/html/ext/howto.html
@@ -295,6 +295,15 @@
        not required to set <code>gcount</code>).
     </dd>
 
+    <dt><a href="lwg-defects.html#103">103</a>:
+        <em>set::iterator is required to be modifiable, but this allows
+           modification of keys.</em>
+    </dt>
+    <dd>For associative containers where the value type is the same as
+        the key type, both <code>iterator</code> and <code>const_iterator
+       </code> are constant iterators.
+    </dd>
+
     <dt><a href="lwg-defects.html#109">109</a>:
         <em>Missing binders for non-const sequence elements</em>
     </dt>

diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h
index c85dbcb..8878996 100644 (file)
--- a/libstdc++-v3/include/bits/stl_multiset.h
+++ b/libstdc++-v3/include/bits/stl_multiset.h
@@ -128,6 +128,9 @@ namespace __gnu_norm
       typedef typename _Alloc::const_pointer const_pointer;
       typedef typename _Alloc::reference reference;
       typedef typename _Alloc::const_reference const_reference;
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // DR 103. set::iterator is required to be modifiable,
+      // but this allows modification of keys.
       typedef typename _Rep_type::const_iterator iterator;
       typedef typename _Rep_type::const_iterator const_iterator;
       typedef typename _Rep_type::const_reverse_iterator reverse_iterator;

diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h
index f5619ba..28e1a3c 100644 (file)
--- a/libstdc++-v3/include/bits/stl_set.h
+++ b/libstdc++-v3/include/bits/stl_set.h
@@ -132,6 +132,9 @@ namespace __gnu_norm
       typedef typename _Alloc::const_pointer const_pointer;
       typedef typename _Alloc::reference reference;
       typedef typename _Alloc::const_reference const_reference;
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // DR 103. set::iterator is required to be modifiable,
+      // but this allows modification of keys.
       typedef typename _Rep_type::const_iterator iterator;
       typedef typename _Rep_type::const_iterator const_iterator;
       typedef typename _Rep_type::const_reverse_iterator reverse_iterator;