[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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f20272d01f51e5157cc567ae6d496bb096270836..555bcd6217b8948cf888cc5cbf601c3815755fa7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
        

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 9d727ba2e023933cfe8ab67c797173572f2df273..21402896eb3ed49b8e83136a46a87b3c24d29611 100644 (file)
--- 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 8858b4b416e2038aa6f3039cd97bc6e5cc4d6064..07e590a2e373a6ae68f992c4460571b83967af3b 100644 (file)
--- 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 990eb781f0339b78b3f1b3b573781e5b1faddae6..c5cf70f8a2cd360f6e70aa125cc3116f58101037 100755 (executable)
--- 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 aca0e056d6739e6d03ef78ccf83e42d8f2296d5b..9026a3e496063b6e137b3d7a2f91a0607fcc23ff 100644 (file)
--- 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;
     }