OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes] 

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.

From-SVN: r68942
This commit is contained in:
Benjamin Kosnik 2003-07-04 22:33:04 +00:00
parent 58add37a5a
commit d542f11447
5 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,14 @@
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>

2
libstdc++-v3/acinclude.m4
View File

@ -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=""

2
libstdc++-v3/aclocal.m4 vendored
View File

@ -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=""

2
libstdc++-v3/configure vendored
View File

@ -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=""

33
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -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;
}