std_limits.h: New file.

2001-08-10 Gabriel Dos Reis <gdr@merlin.codesourcery.com> Mark Mitchell <mark@codesourcery.com> * include/bits/std_limits.h: New file. * include/Makefile.am (bits_headers): Add std_limits.h (all-local): std_limits.h is no longer built. (${target_builddir}/std_limits.h): Remove. * include/Makefile.in: Regenerate. * src/limits.cc: New file. * src/Makefile.am (sources): Add limits.cc in replacement of limitsMEMBERS.cc. * src/Makefile.in: Regenerate. From-SVN: r44766

std_limits.h: New file.
2001-08-10 Gabriel Dos Reis <gdr@merlin.codesourcery.com> Mark Mitchell <mark@codesourcery.com> * include/bits/std_limits.h: New file. * include/Makefile.am (bits_headers): Add std_limits.h (all-local): std_limits.h is no longer built. (${target_builddir}/std_limits.h): Remove. * include/Makefile.in: Regenerate. * src/limits.cc: New file. * src/Makefile.am (sources): Add limits.cc in replacement of limitsMEMBERS.cc. * src/Makefile.in: Regenerate. From-SVN: r44766
aa240818 · Gabriel Dos Reis · Gabriel Dos Reis · c914d981 · aa240818 · aa240818
Commit aa240818 authored Aug 10, 2001 by Gabriel Dos Reis Committed by Gabriel Dos Reis Aug 10, 2001
8 changed files
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+2001-08-10  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
+
+	* include/bits/std_limits.h: New file.
+	* include/Makefile.am (bits_headers): Add std_limits.h
+	(all-local): std_limits.h is no longer built.
+	(${target_builddir}/std_limits.h): Remove.
+	* include/Makefile.in: Regenerate.
+	* src/limits.cc: New file.
+	* src/Makefile.am (sources): Add limits.cc in replacement of
+	limitsMEMBERS.cc.
+	* src/Makefile.in: Regenerate.
+
+
+2001-08-09  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
+
+	* src/gen-num-limits.cc (digits10): Fix thinko.
+
 2001-08-09  Benjamin Kosnik  <bkoz@redhat.com>

 	* po/Makefile.am (check-no): Add.

--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.

-## $Id: Makefile.am,v 1.1 2001/07/13 16:47:55 pme Exp $
+## $Id: Makefile.am,v 1.2 2001/08/08 02:48:59 bkoz Exp $

 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -78,6 +78,7 @@ bits_headers = \
 	${bits_srcdir}/std_iostream.h \
 	${bits_srcdir}/std_istream.h \
 	${bits_srcdir}/std_iterator.h \
+	${bits_srcdir}/std_limits.h \
 	${bits_srcdir}/std_list.h \
 	${bits_srcdir}/std_locale.h \
 	${bits_srcdir}/std_map.h \
@@ -305,7 +306,6 @@ CLEANFILES = ${allstamps}
 # Here are the rules for building the headers
 all-local: \
 	${target_builddir}/c++config.h \
-	${target_builddir}/std_limits.h \
 	${allstamps}

 stamp-std: ${std_headers}
@@ -402,15 +402,6 @@ ${target_builddir}/c++config.h: ${glibcpp_builddir}/config.h \
 	    < ${glibcpp_builddir}/config.h >> $@ ;\
 	echo "#endif // _CPP_CPPCONFIG_" >>$@

-# This tool leaves the header in the wrong place, but rather than fix the
-# tool, the destination get massaged here.
-${target_builddir}/std_limits.h: ${target_builddir}/c++config.h \
-				 stamp-target ${target_builddir}
-	CC="$(CC) -I${glibcpp_builddir} -I${target_builddir}/.." \
-	${glibcpp_srcdir}/mknumeric_limits \
-	${glibcpp_builddir} ${glibcpp_srcdir} @GLIBCPP_IS_CROSS_COMPILING@ ;\
-	mv ${glibcpp_builddir}/include/bits/std_limits.h ${target_builddir}
-
 glibcpp_thread_h = @glibcpp_thread_h@
 uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]


--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -154,7 +154,7 @@ glibcpp_builddir = @glibcpp_builddir@

 bits_srcdir = ${glibcpp_srcdir}/include/bits
 bits_builddir = ./bits
-bits_headers =  	${bits_srcdir}/basic_file.h 	${bits_srcdir}/basic_ios.h 	${bits_srcdir}/basic_ios.tcc 	${bits_srcdir}/basic_string.h 	${bits_srcdir}/basic_string.tcc 	${bits_srcdir}/boost_concept_check.h 	${bits_srcdir}/char_traits.h 	${bits_srcdir}/codecvt.h 	${bits_srcdir}/concept_check.h 	${bits_srcdir}/cpp_type_traits.h 	${bits_srcdir}/fpos.h 	${bits_srcdir}/fstream.tcc 	${bits_srcdir}/functexcept.h 	${bits_srcdir}/generic_shadow.h 	${bits_srcdir}/gslice.h 	${bits_srcdir}/gslice_array.h 	${bits_srcdir}/indirect_array.h 	${bits_srcdir}/ios_base.h 	${bits_srcdir}/istream.tcc 	${bits_srcdir}/locale_facets.h 	${bits_srcdir}/locale_facets.tcc 	${bits_srcdir}/localefwd.h 	${bits_srcdir}/mask_array.h 	${bits_srcdir}/ostream.tcc 	${bits_srcdir}/pthread_allocimpl.h 	${bits_srcdir}/stream_iterator.h 	${bits_srcdir}/streambuf_iterator.h 	${bits_srcdir}/slice.h 	${bits_srcdir}/slice_array.h 	${bits_srcdir}/sstream.tcc 	${bits_srcdir}/std_algorithm.h 	${bits_srcdir}/std_bitset.h 	${bits_srcdir}/std_complex.h 	${bits_srcdir}/std_deque.h 	${bits_srcdir}/std_fstream.h 	${bits_srcdir}/std_functional.h 	${bits_srcdir}/std_iomanip.h 	${bits_srcdir}/std_ios.h 	${bits_srcdir}/std_iosfwd.h 	${bits_srcdir}/std_iostream.h 	${bits_srcdir}/std_istream.h 	${bits_srcdir}/std_iterator.h 	${bits_srcdir}/std_list.h 	${bits_srcdir}/std_locale.h 	${bits_srcdir}/std_map.h 	${bits_srcdir}/std_memory.h 	${bits_srcdir}/std_numeric.h 	${bits_srcdir}/std_ostream.h 	${bits_srcdir}/std_queue.h 	${bits_srcdir}/std_set.h 	${bits_srcdir}/std_sstream.h 	${bits_srcdir}/std_stack.h 	${bits_srcdir}/std_stdexcept.h 	${bits_srcdir}/std_streambuf.h 	${bits_srcdir}/std_string.h 	${bits_srcdir}/std_utility.h 	${bits_srcdir}/std_valarray.h 	${bits_srcdir}/std_vector.h 	${bits_srcdir}/stl_algo.h 	${bits_srcdir}/stl_algobase.h 	${bits_srcdir}/stl_alloc.h 	${bits_srcdir}/stl_bvector.h 	${bits_srcdir}/stl_construct.h 	${bits_srcdir}/stl_deque.h 	${bits_srcdir}/stl_function.h 	${bits_srcdir}/stl_heap.h 	${bits_srcdir}/stl_iterator.h 	${bits_srcdir}/stl_iterator_base_funcs.h 	${bits_srcdir}/stl_iterator_base_types.h 	${bits_srcdir}/stl_list.h 	${bits_srcdir}/stl_map.h 	${bits_srcdir}/stl_multimap.h 	${bits_srcdir}/stl_multiset.h 	${bits_srcdir}/stl_numeric.h 	${bits_srcdir}/stl_pair.h 	${bits_srcdir}/stl_pthread_alloc.h 	${bits_srcdir}/stl_queue.h 	${bits_srcdir}/stl_raw_storage_iter.h 	${bits_srcdir}/stl_relops.h 	${bits_srcdir}/stl_set.h 	${bits_srcdir}/stl_stack.h 	${bits_srcdir}/stl_tempbuf.h 	${bits_srcdir}/stl_threads.h 	${bits_srcdir}/stl_tree.h 	${bits_srcdir}/stl_uninitialized.h 	${bits_srcdir}/stl_vector.h 	${bits_srcdir}/streambuf.tcc 	${bits_srcdir}/stringfwd.h 	${bits_srcdir}/type_traits.h 	${bits_srcdir}/valarray_array.h 	${bits_srcdir}/valarray_array.tcc 	${bits_srcdir}/valarray_meta.h
+bits_headers =  	${bits_srcdir}/basic_file.h 	${bits_srcdir}/basic_ios.h 	${bits_srcdir}/basic_ios.tcc 	${bits_srcdir}/basic_string.h 	${bits_srcdir}/basic_string.tcc 	${bits_srcdir}/boost_concept_check.h 	${bits_srcdir}/char_traits.h 	${bits_srcdir}/codecvt.h 	${bits_srcdir}/concept_check.h 	${bits_srcdir}/cpp_type_traits.h 	${bits_srcdir}/fpos.h 	${bits_srcdir}/fstream.tcc 	${bits_srcdir}/functexcept.h 	${bits_srcdir}/generic_shadow.h 	${bits_srcdir}/gslice.h 	${bits_srcdir}/gslice_array.h 	${bits_srcdir}/indirect_array.h 	${bits_srcdir}/ios_base.h 	${bits_srcdir}/istream.tcc 	${bits_srcdir}/locale_facets.h 	${bits_srcdir}/locale_facets.tcc 	${bits_srcdir}/localefwd.h 	${bits_srcdir}/mask_array.h 	${bits_srcdir}/ostream.tcc 	${bits_srcdir}/pthread_allocimpl.h 	${bits_srcdir}/stream_iterator.h 	${bits_srcdir}/streambuf_iterator.h 	${bits_srcdir}/slice.h 	${bits_srcdir}/slice_array.h 	${bits_srcdir}/sstream.tcc 	${bits_srcdir}/std_algorithm.h 	${bits_srcdir}/std_bitset.h 	${bits_srcdir}/std_complex.h 	${bits_srcdir}/std_deque.h 	${bits_srcdir}/std_fstream.h 	${bits_srcdir}/std_functional.h 	${bits_srcdir}/std_iomanip.h 	${bits_srcdir}/std_ios.h 	${bits_srcdir}/std_iosfwd.h 	${bits_srcdir}/std_iostream.h 	${bits_srcdir}/std_istream.h 	${bits_srcdir}/std_iterator.h 	${bits_srcdir}/std_limits.h 	${bits_srcdir}/std_list.h 	${bits_srcdir}/std_locale.h 	${bits_srcdir}/std_map.h 	${bits_srcdir}/std_memory.h 	${bits_srcdir}/std_numeric.h 	${bits_srcdir}/std_ostream.h 	${bits_srcdir}/std_queue.h 	${bits_srcdir}/std_set.h 	${bits_srcdir}/std_sstream.h 	${bits_srcdir}/std_stack.h 	${bits_srcdir}/std_stdexcept.h 	${bits_srcdir}/std_streambuf.h 	${bits_srcdir}/std_string.h 	${bits_srcdir}/std_utility.h 	${bits_srcdir}/std_valarray.h 	${bits_srcdir}/std_vector.h 	${bits_srcdir}/stl_algo.h 	${bits_srcdir}/stl_algobase.h 	${bits_srcdir}/stl_alloc.h 	${bits_srcdir}/stl_bvector.h 	${bits_srcdir}/stl_construct.h 	${bits_srcdir}/stl_deque.h 	${bits_srcdir}/stl_function.h 	${bits_srcdir}/stl_heap.h 	${bits_srcdir}/stl_iterator.h 	${bits_srcdir}/stl_iterator_base_funcs.h 	${bits_srcdir}/stl_iterator_base_types.h 	${bits_srcdir}/stl_list.h 	${bits_srcdir}/stl_map.h 	${bits_srcdir}/stl_multimap.h 	${bits_srcdir}/stl_multiset.h 	${bits_srcdir}/stl_numeric.h 	${bits_srcdir}/stl_pair.h 	${bits_srcdir}/stl_pthread_alloc.h 	${bits_srcdir}/stl_queue.h 	${bits_srcdir}/stl_raw_storage_iter.h 	${bits_srcdir}/stl_relops.h 	${bits_srcdir}/stl_set.h 	${bits_srcdir}/stl_stack.h 	${bits_srcdir}/stl_tempbuf.h 	${bits_srcdir}/stl_threads.h 	${bits_srcdir}/stl_tree.h 	${bits_srcdir}/stl_uninitialized.h 	${bits_srcdir}/stl_vector.h 	${bits_srcdir}/streambuf.tcc 	${bits_srcdir}/stringfwd.h 	${bits_srcdir}/type_traits.h 	${bits_srcdir}/valarray_array.h 	${bits_srcdir}/valarray_array.tcc 	${bits_srcdir}/valarray_meta.h


 backward_srcdir = ${glibcpp_srcdir}/include/backward
@@ -308,7 +308,6 @@ mostlyclean distclean maintainer-clean
 # Here are the rules for building the headers
 all-local: \
 	${target_builddir}/c++config.h \
-	${target_builddir}/std_limits.h \
 	${allstamps}

 stamp-std: ${std_headers}
@@ -405,15 +404,6 @@ ${target_builddir}/c++config.h: ${glibcpp_builddir}/config.h \
 	    < ${glibcpp_builddir}/config.h >> $@ ;\
 	echo "#endif // _CPP_CPPCONFIG_" >>$@

-# This tool leaves the header in the wrong place, but rather than fix the
-# tool, the destination get massaged here.
-${target_builddir}/std_limits.h: ${target_builddir}/c++config.h \
-				 stamp-target ${target_builddir}
-	CC="$(CC) -I${glibcpp_builddir} -I${target_builddir}/.." \
-	${glibcpp_srcdir}/mknumeric_limits \
-	${glibcpp_builddir} ${glibcpp_srcdir} @GLIBCPP_IS_CROSS_COMPILING@ ;\
-	mv ${glibcpp_builddir}/include/bits/std_limits.h ${target_builddir}
-
 ${thread_builddir}/gthr.h:
 	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \

--- a/libstdc++-v3/include/bits/std_limits.h
+++ b/libstdc++-v3/include/bits/std_limits.h
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.

-## $Id: Makefile.am,v 1.91 2001/08/08 02:49:00 bkoz Exp $
+## $Id: Makefile.am,v 1.92 2001/08/08 22:39:28 bkoz Exp $

 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -63,7 +63,7 @@ INCLUDES = \

 sources = \
 	basic_file.cc bitset.cc c++locale.cc cmath.cc codecvt.cc \
-	complex_io.cc functexcept.cc globals.cc ios.cc limitsMEMBERS.cc \
+	complex_io.cc functexcept.cc globals.cc ios.cc limits.cc \
 	locale.cc locale-inst.cc localename.cc messages_members.cc \
 	misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc \
 	valarray-inst.cc wstring-inst.cc

--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -174,7 +174,7 @@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 INCLUDES =  	-nostdinc++ 	$(GLIBCPP_INCLUDES) 	$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) 	$(TOPLEVEL_INCLUDES)


-sources =  	basic_file.cc bitset.cc c++locale.cc cmath.cc codecvt.cc 	complex_io.cc functexcept.cc globals.cc ios.cc limitsMEMBERS.cc 	locale.cc locale-inst.cc localename.cc messages_members.cc 	misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc 	valarray-inst.cc wstring-inst.cc
+sources =  	basic_file.cc bitset.cc c++locale.cc cmath.cc codecvt.cc 	complex_io.cc functexcept.cc globals.cc ios.cc limits.cc 	locale.cc locale-inst.cc localename.cc messages_members.cc 	misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc 	valarray-inst.cc wstring-inst.cc


 VPATH = $(top_srcdir):$(top_srcdir)/src
@@ -243,10 +243,10 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libstdc___la_OBJECTS =  basic_file.lo bitset.lo c++locale.lo cmath.lo \
-codecvt.lo complex_io.lo functexcept.lo globals.lo ios.lo \
-limitsMEMBERS.lo locale.lo locale-inst.lo localename.lo \
-messages_members.lo misc-inst.lo stdexcept.lo stl-inst.lo \
-string-inst.lo strstream.lo valarray-inst.lo wstring-inst.lo
+codecvt.lo complex_io.lo functexcept.lo globals.lo ios.lo limits.lo \
+locale.lo locale-inst.lo localename.lo messages_members.lo misc-inst.lo \
+stdexcept.lo stl-inst.lo string-inst.lo strstream.lo valarray-inst.lo \
+wstring-inst.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)

--- a/libstdc++-v3/src/gen-num-limits.cc
+++ b/libstdc++-v3/src/gen-num-limits.cc
@@ -584,7 +584,7 @@ template<typename T>
 void digits10()
 {
  printf("%s%s = %d;\n", tab2, "static const int digits10",
-	 int(log10_of_two * value<T>::digits));
+	 int(log10_of_two * value<T>::digits) + 1);
 }

 template<typename T>

--- a/libstdc++-v3/src/limits.cc
+++ b/libstdc++-v3/src/limits.cc