aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2002-04-09 10:00:08 +0200
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2002-04-09 08:00:08 +0000
commitb0396e3b6c681cd37a2e238062091ce37d1955be (patch)
tree90418de30eb0f77bb25013c67d1c909f73a00110
parent1cb7f91f86f8393e3a7ee4e83fa489469cbb9788 (diff)
downloadgcc-b0396e3b6c681cd37a2e238062091ce37d1955be.zip
gcc-b0396e3b6c681cd37a2e238062091ce37d1955be.tar.gz
gcc-b0396e3b6c681cd37a2e238062091ce37d1955be.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/bits/locale_facets.h6
-rw-r--r--libstdc++-v3/src/locale.cc5
3 files changed, 7 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 48e1111..3872116 100644
--- 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 c00e17c..a45023f 100644
--- 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 d2fd763..02177ed 100644
--- 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)