locale_facets.h (__num_base::_S_scale_hex): Remove.

2002-04-09  Jakub Jelinek  <jakub@redhat.com>

	* include/bits/locale_facets.h (__num_base::_S_scale_hex): Remove.
	(__num_base::_S_scale_oct): Remove.
	* src/locale.cc (__num_base::_S_scale_hex): Remove.
	(__num_base::_S_scale_oct): Remove.

From-SVN: r52068

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 48e111125503041522420dd8728114df2bc4966a..38721167630aa40ebd13a47c68a4451e846078e7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-09  Jakub Jelinek  <jakub@redhat.com>
+
+       * include/bits/locale_facets.h (__num_base::_S_scale_hex): Remove.
+       (__num_base::_S_scale_oct): Remove.
+       * src/locale.cc (__num_base::_S_scale_hex): Remove.
+       (__num_base::_S_scale_oct): Remove.
+
 2002-04-09  Benjamin Kosnik  <bkoz@redhat.com>
 
        libstdc++/6124

diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index c00e17cd5aaec42cfc1180fc4c3f56514d1a78f7..a45023f8cb6529305be164ceeee5384918d5d920 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -421,12 +421,6 @@ namespace std
   class __num_base 
   {
   protected:
-    // Used to establish gating factor for base 16 input.
-    static const double _S_scale_hex;
-    
-    // Used to establish gating factor for base 8 input.
-    static const double _S_scale_oct;
-
     // String literal of acceptable (narrow) input, for num_get.
     // "0123456789eEabcdfABCDF"
     static const char _S_atoms[];

diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index d2fd763160316331d3646491120e144b082018d4..02177ed73c53c6975e7315614655abb950d9876b 100644 (file)
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -514,13 +514,8 @@ namespace std
     }
 #endif
 
-
   const char __num_base::_S_atoms[] = "0123456789eEabcdfABCDF";
 
-  const double __num_base::_S_scale_hex = log(10.0)/log(16.0);
-
-  const double __num_base::_S_scale_oct = log(10.0)/log(8.0);
-
   bool
   __num_base::_S_format_float(const ios_base& __io, char* __fptr, char __mod,
                              streamsize __prec)