From 7f2e0dffc689c5b1234dcba0c7cd548ff8b3aff7 Mon Sep 17 00:00:00 2001
From: Phil Edwards <pme@gcc.gnu.org>
Date: Mon, 3 Jun 2002 04:45:03 +0000
Subject: [PATCH] TODO: Update.
2002-06-03 Phil Edwards <pme@gcc.gnu.org>
* docs/doxygen/TODO: Update.
* docs/doxygen/user.cfg.in (SORT_MEMBER_DOCS): Set to off, now that
some class members are in 14882 order.
* docs/html/ext/howto.html: 3.1 is in the past now, not the future.
* include/std/std_bitset.h: Update comment.
* src/bitset.cc: Update comments, clean up spacing.
* src/Makefile.am (sources): Alphabetize for convenience.
* src/Makefile.in: Regenerate.
From-SVN: r54200
---
libstdc++-v3/ChangeLog | 13 ++
libstdc++-v3/docs/doxygen/TODO | 3 +-
libstdc++-v3/docs/doxygen/user.cfg.in | 2 +-
libstdc++-v3/docs/html/ext/howto.html | 4 +-
libstdc++-v3/include/std/std_bitset.h | 2 +-
libstdc++-v3/src/Makefile.am | 46 +++++--
libstdc++-v3/src/Makefile.in | 173 +++++++++++++++++++-------
libstdc++-v3/src/bitset.cc | 15 +--
8 files changed, 193 insertions(+), 65 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb8f06c8e499..3f98c60336ee 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+2002-06-03 Phil Edwards <pme@gcc.gnu.org>
+
+ * docs/doxygen/TODO: Update.
+ * docs/doxygen/user.cfg.in (SORT_MEMBER_DOCS): Set to off, now that
+ some class members are in 14882 order.
+ * docs/html/ext/howto.html: 3.1 is in the past now, not the future.
+
+ * include/std/std_bitset.h: Update comment.
+ * src/bitset.cc: Update comments, clean up spacing.
+
+ * src/Makefile.am (sources): Alphabetize for convenience.
+ * src/Makefile.in: Regenerate.
+
2002-06-03 Phil Edwards <pme@gcc.gnu.org>
* include/bits/stl_deque.h, include/bits/stl_list.h,
diff --git a/libstdc++-v3/docs/doxygen/TODO b/libstdc++-v3/docs/doxygen/TODO
index 662993396e2d..b01dca9ff9c9 100644
--- a/libstdc++-v3/docs/doxygen/TODO
+++ b/libstdc++-v3/docs/doxygen/TODO
@@ -24,7 +24,8 @@ c19 Note A
c20 Note A
c21 Untouched, Note B
c22 Untouched
-c23 See doxygroups.cc and Note B.
+c23 See doxygroups.cc and Note B. Notes on what invalidates
+ iterators need to be added.
c24 stl_iterator.h (__normal_iterator, other small TODO bits)
stream iterators
c25 stl_algo.h (lots of stuff)
diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in
index 3a47fff1cae5..776ddba2b48a 100644
--- a/libstdc++-v3/docs/doxygen/user.cfg.in
+++ b/libstdc++-v3/docs/doxygen/user.cfg.in
@@ -183,7 +183,7 @@ INLINE_INFO = YES
# alphabetically by member name. If set to NO the members will appear in
# declaration order.
-SORT_MEMBER_DOCS = YES
+SORT_MEMBER_DOCS = NO
# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
# tag is set to YES, then doxygen will reuse the documentation of the first
diff --git a/libstdc++-v3/docs/html/ext/howto.html b/libstdc++-v3/docs/html/ext/howto.html
index cbea1f583958..756265280644 100644
--- a/libstdc++-v3/docs/html/ext/howto.html
+++ b/libstdc++-v3/docs/html/ext/howto.html
@@ -219,8 +219,8 @@
<p>Well then:
</p>
<h3>Available allocators in namespace std</h3>
- <p>First I'll describe the situation as it exists for the code which will
- be released in GCC 3.1. This situation is extremely fluid. Then I'll
+ <p>First I'll describe the situation as it exists for the code which
+ was released in GCC 3.1. Then I'll
describe the differences for 3.0.x, which will not change much in
this respect.
</p>
diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h
index fe60b01f347c..e938662b4eea 100644
--- a/libstdc++-v3/include/std/std_bitset.h
+++ b/libstdc++-v3/include/std/std_bitset.h
@@ -578,7 +578,7 @@ namespace std
* (Note that %bitset does @e not meet the formal requirements of a
* <a href="tables.html#65">container</a>. Mainly, it lacks iterators.)
*
- * The template argument, @a _Nb, may be any nonzero number of type
+ * The template argument, @a _Nb, may be any non-negative number of type
* size_t.
*
* A %bitset of size N has N % (sizeof(unsigned long) * CHAR_BIT) unused
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index e1eec8cc44a3..44fd4a45939e 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -61,16 +61,42 @@ INCLUDES = \
$(TOPLEVEL_INCLUDES)
sources = \
- globals.cc limits.cc \
- basic_file.cc complex_io.cc ios.cc strstream.cc \
- cmath.cc bitset.cc \
- functexcept.cc stdexcept.cc vterminate.cc \
- c++locale.cc locale.cc localename.cc codecvt.cc \
- collate.cc ctype.cc messages.cc monetary.cc numeric.cc time.cc \
- concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
- string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc \
- fstream-inst.cc io-inst.cc istream-inst.cc ostream-inst.cc \
- streambuf-inst.cc sstream-inst.cc
+ basic_file.cc \
+ bitset.cc \
+ c++locale.cc \
+ cmath.cc \
+ codecvt.cc \
+ collate.cc \
+ complex_io.cc \
+ concept-inst.cc \
+ ctype.cc \
+ ext-inst.cc \
+ fstream-inst.cc \
+ functexcept.cc \
+ globals.cc \
+ io-inst.cc \
+ ios.cc \
+ istream-inst.cc \
+ limits.cc \
+ locale-inst.cc \
+ locale.cc \
+ localename.cc \
+ messages.cc \
+ misc-inst.cc \
+ monetary.cc \
+ numeric.cc \
+ ostream-inst.cc \
+ sstream-inst.cc \
+ stdexcept.cc \
+ stl-inst.cc \
+ streambuf-inst.cc \
+ string-inst.cc \
+ strstream.cc \
+ time.cc \
+ valarray-inst.cc \
+ vterminate.cc \
+ wstring-inst.cc
+
VPATH = $(top_srcdir)/src:$(top_srcdir)
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 46b34f95e6a2..34675bbaae58 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -168,16 +168,41 @@ INCLUDES = \
sources = \
- globals.cc limits.cc \
- basic_file.cc complex_io.cc ios.cc strstream.cc \
- cmath.cc bitset.cc \
- functexcept.cc stdexcept.cc vterminate.cc \
- c++locale.cc locale.cc localename.cc codecvt.cc \
- collate.cc ctype.cc messages.cc monetary.cc numeric.cc time.cc \
- concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
- string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc \
- fstream-inst.cc io-inst.cc istream-inst.cc ostream-inst.cc \
- streambuf-inst.cc sstream-inst.cc
+ basic_file.cc \
+ bitset.cc \
+ c++locale.cc \
+ cmath.cc \
+ codecvt.cc \
+ collate.cc \
+ complex_io.cc \
+ concept-inst.cc \
+ ctype.cc \
+ ext-inst.cc \
+ fstream-inst.cc \
+ functexcept.cc \
+ globals.cc \
+ io-inst.cc \
+ ios.cc \
+ istream-inst.cc \
+ limits.cc \
+ locale-inst.cc \
+ locale.cc \
+ localename.cc \
+ messages.cc \
+ misc-inst.cc \
+ monetary.cc \
+ numeric.cc \
+ ostream-inst.cc \
+ sstream-inst.cc \
+ stdexcept.cc \
+ stl-inst.cc \
+ streambuf-inst.cc \
+ string-inst.cc \
+ strstream.cc \
+ time.cc \
+ valarray-inst.cc \
+ vterminate.cc \
+ wstring-inst.cc
VPATH = $(top_srcdir)/src:$(top_srcdir)
@@ -255,13 +280,14 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-libstdc___la_OBJECTS = globals.lo limits.lo basic_file.lo complex_io.lo \
-ios.lo strstream.lo cmath.lo bitset.lo functexcept.lo stdexcept.lo \
-vterminate.lo c++locale.lo locale.lo localename.lo codecvt.lo \
-collate.lo ctype.lo messages.lo monetary.lo numeric.lo time.lo \
-concept-inst.lo locale-inst.lo misc-inst.lo stl-inst.lo string-inst.lo \
-wstring-inst.lo valarray-inst.lo ext-inst.lo fstream-inst.lo io-inst.lo \
-istream-inst.lo ostream-inst.lo streambuf-inst.lo sstream-inst.lo
+libstdc___la_OBJECTS = basic_file.lo bitset.lo c++locale.lo cmath.lo \
+codecvt.lo collate.lo complex_io.lo concept-inst.lo ctype.lo \
+ext-inst.lo fstream-inst.lo functexcept.lo globals.lo io-inst.lo ios.lo \
+istream-inst.lo limits.lo locale-inst.lo locale.lo localename.lo \
+messages.lo misc-inst.lo monetary.lo numeric.lo ostream-inst.lo \
+sstream-inst.lo stdexcept.lo stl-inst.lo streambuf-inst.lo \
+string-inst.lo strstream.lo time.lo valarray-inst.lo vterminate.lo \
+wstring-inst.lo
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
@@ -272,6 +298,17 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
+DEP_FILES = .deps/basic_file.P .deps/bitset.P .deps/c++locale.P \
+.deps/cmath.P .deps/codecvt.P .deps/collate.P .deps/complex_io.P \
+.deps/concept-inst.P .deps/ctype.P .deps/ext-inst.P \
+.deps/fstream-inst.P .deps/functexcept.P .deps/globals.P \
+.deps/io-inst.P .deps/ios.P .deps/istream-inst.P .deps/limits.P \
+.deps/locale-inst.P .deps/locale.P .deps/localename.P .deps/messages.P \
+.deps/misc-inst.P .deps/monetary.P .deps/numeric.P .deps/ostream-inst.P \
+.deps/sstream-inst.P .deps/stdexcept.P .deps/stl-inst.P \
+.deps/streambuf-inst.P .deps/string-inst.P .deps/strstream.P \
+.deps/time.P .deps/valarray-inst.P .deps/vterminate.P \
+.deps/wstring-inst.P
SOURCES = $(libstdc___la_SOURCES)
OBJECTS = $(libstdc___la_OBJECTS)
@@ -279,9 +316,9 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .cc .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --cygnus src/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -311,9 +348,6 @@ uninstall-toolexeclibLTLIBRARIES:
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
done
-.c.o:
- $(COMPILE) -c $<
-
# FIXME: We should only use cygpath when building on Windows,
# and only if it is available.
.c.obj:
@@ -336,9 +370,6 @@ distclean-compile:
maintainer-clean-compile:
-.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
.s.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -398,8 +429,13 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = src
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits src/Makefile
@for file in $(DISTFILES); do \
- if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \
else \
@@ -408,16 +444,65 @@ distdir: $(DISTFILES)
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+ -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
+
+%.lo: %.c
+ @echo '$(LTCOMPILE) -c $<'; \
+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
+
+%.o: %.cc
+ @echo '$(CXXCOMPILE) -c $<'; \
+ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
+
+%.lo: %.cc
+ @echo '$(LTCXXCOMPILE) -c $<'; \
+ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
dvi: dvi-am
-check-am:
+check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
-install-info-am:
-install-info: install-info-am
install-exec-am: install-toolexeclibLTLIBRARIES
install-exec: install-exec-am
@@ -447,27 +532,27 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
- mostlyclean-libtool mostlyclean-tags \
+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \
- clean-tags clean-generic mostlyclean-am
+ clean-tags clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \
- distclean-libtool distclean-tags distclean-generic \
- clean-am
+ distclean-libtool distclean-tags distclean-depend \
+ distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
- maintainer-clean-tags maintainer-clean-generic \
- distclean-am
+ maintainer-clean-tags maintainer-clean-depend \
+ maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
@@ -480,12 +565,14 @@ uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
strstream.lo: strstream.cc
$(LTCXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated -c $<
diff --git a/libstdc++-v3/src/bitset.cc b/libstdc++-v3/src/bitset.cc
index 244f308924fb..2d313a72081a 100644
--- a/libstdc++-v3/src/bitset.cc
+++ b/libstdc++-v3/src/bitset.cc
@@ -8,12 +8,12 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2, or (at your option)
// any later version.
-//
+//
// GNU CC is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with GNU CC; see the file COPYING. If not, write to
// the Free Software Foundation, 59 Temple Place - Suite 330,
@@ -39,7 +39,7 @@
* in supporting documentation. Silicon Graphics makes no
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied warranty.
- */
+ */
#include <bitset>
@@ -69,7 +69,7 @@ std::_Base_bitset<1>::_M_do_find_first(std::size_t __not_found) const
}
std::size_t
-std::_Base_bitset<1>::_M_do_find_next(std::size_t __prev,
+std::_Base_bitset<1>::_M_do_find_next(std::size_t __prev,
std::size_t __not_found) const
{
// make bound inclusive
@@ -104,8 +104,9 @@ std::_Base_bitset<1>::_M_do_find_next(std::size_t __prev,
} // end _M_do_find_next
-// Lookup tables for find and count operations.
-unsigned char std::_S_bit_count[256] =
+// Lookup tables for find and count operations. In _S_bit_count, the value
+// *at* an index is the number of bits set *in* that index.
+unsigned char std::_S_bit_count[256] =
{
0, /* 0 */ 1, /* 1 */ 1, /* 2 */ 2, /* 3 */ 1, /* 4 */
2, /* 5 */ 2, /* 6 */ 3, /* 7 */ 1, /* 8 */ 2, /* 9 */
@@ -161,7 +162,7 @@ unsigned char std::_S_bit_count[256] =
8 /* 255 */
}; // end _S_bit_count
-unsigned char std::_S_first_one[256] =
+unsigned char std::_S_first_one[256] =
{
0, /* 0 */ 0, /* 1 */ 1, /* 2 */ 0, /* 3 */ 2, /* 4 */
0, /* 5 */ 1, /* 6 */ 0, /* 7 */ 3, /* 8 */ 0, /* 9 */
--
GitLab