diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 11 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 2 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 33 |
5 files changed, 31 insertions, 19 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f20272d..555bcd6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,15 @@ 2003-07-04 Benjamin Kosnik <bkoz@redhat.com> + + * acinclude.m4 (GLIBCPP_ENABLE_PCH): Fix missed variable. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2003-07-04 Jerry Quinn <jlquinn@optonline.net> + + * include/bits/locale_facets.tcc (__int_to_char): Move common case + to the top. + +2003-07-04 Benjamin Kosnik <bkoz@redhat.com> Petur Runolfsson <peturr02@ru.is> * config/io/basic_file_stdio.cc: Revert. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 9d727ba..2140289 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1428,7 +1428,7 @@ enable_libstdcxx_pch=GLIBCPP_ENABLE_PCH_DEFAULT)dnl AC_MSG_RESULT([$enable_libstdcxx_pch]) AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$enable_libstdcxx_pch" = yes) - if test "$enable_pch" = yes; then + if test "$enable_libstdcxx_pch" = yes; then glibcpp_PCHFLAGS="-include bits/stdc++.h" else glibcpp_PCHFLAGS="" diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 8858b4b..07e590a 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1440,7 +1440,7 @@ enable_libstdcxx_pch=GLIBCPP_ENABLE_PCH_DEFAULT)dnl AC_MSG_RESULT([$enable_libstdcxx_pch]) AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$enable_libstdcxx_pch" = yes) - if test "$enable_pch" = yes; then + if test "$enable_libstdcxx_pch" = yes; then glibcpp_PCHFLAGS="-include bits/stdc++.h" else glibcpp_PCHFLAGS="" diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 990eb78..c5cf70f 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -2896,7 +2896,7 @@ else GLIBCPP_BUILD_PCH_TRUE='#' GLIBCPP_BUILD_PCH_FALSE= fi - if test "$enable_pch" = yes; then + if test "$enable_libstdcxx_pch" = yes; then glibcpp_PCHFLAGS="-include bits/stdc++.h" else glibcpp_PCHFLAGS="" diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index aca0e05..9026a3e 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -692,7 +692,22 @@ namespace std _CharT* __buf = __out + __size - 1; _CharT* __bufend = __out + __size; - if (__builtin_expect(__basefield == ios_base::oct, false)) + if (__builtin_expect(__basefield != ios_base::oct && + __basefield != ios_base::hex, true)) + { + // Decimal. + do + { + *__buf-- = __lit[(__v % 10) + __num_base::_S_odigits]; + __v /= 10; + } + while (__v != 0); + if (__neg) + *__buf-- = __lit[__num_base::_S_ominus]; + else if (__flags & ios_base::showpos) + *__buf-- = __lit[__num_base::_S_oplus]; + } + else if (__basefield == ios_base::oct) { // Octal. do @@ -704,7 +719,7 @@ namespace std if (__showbase) *__buf-- = __lit[__num_base::_S_odigits]; } - else if (__builtin_expect(__basefield == ios_base::hex, false)) + else { // Hex. const bool __uppercase = __flags & ios_base::uppercase; @@ -724,20 +739,6 @@ namespace std *__buf-- = __lit[__num_base::_S_odigits]; } } - else - { - // Decimal. - do - { - *__buf-- = __lit[(__v % 10) + __num_base::_S_odigits]; - __v /= 10; - } - while (__v != 0); - if (__neg) - *__buf-- = __lit[__num_base::_S_ominus]; - else if (__flags & ios_base::showpos) - *__buf-- = __lit[__num_base::_S_oplus]; - } int __ret = __bufend - __buf - 1; return __ret; } |