From 9b6e0e57a1acad4ecef432950815c3b4a793f700 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Wed, 23 Jan 2002 03:50:49 +0000
Subject: [PATCH] c_locale_generic.cc: Fix.
2002-01-22 Benjamin Kosnik <bkoz@redhat.com>
* config/locale/c_locale_generic.cc: Fix.
From-SVN: r49125
---
libstdc++-v3/ChangeLog | 4 ++++
libstdc++-v3/config/locale/c_locale_generic.cc | 4 ++--
libstdc++-v3/include/std/std_ostream.h | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4776d8c4f804..5e011aa15e17 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-22 Benjamin Kosnik <bkoz@redhat.com>
+
+ * config/locale/c_locale_generic.cc: Fix.
+
2002-01-22 Benjamin Kosnik <bkoz@redhat.com>
* docs/html/22_locale/messages.html: Remove angle brackets.
diff --git a/libstdc++-v3/config/locale/c_locale_generic.cc b/libstdc++-v3/config/locale/c_locale_generic.cc
index 7133cd33edb3..6644916b8c0a 100644
--- a/libstdc++-v3/config/locale/c_locale_generic.cc
+++ b/libstdc++-v3/config/locale/c_locale_generic.cc
@@ -168,10 +168,10 @@ namespace std
if (__sanity != __s && *__sanity == '\0' && errno == 0)
__v = __ld;
#else
- typedef typename char_traits<_CharT>::int_type int_type;
+ typedef typename char_traits<char>::int_type int_type;
long double __ld;
int __p = sscanf(__s, "%Lf", &__ld);
- if (__p && static_cast<int_type>(__p) != char_traits<_CharT>::eof())
+ if (__p && static_cast<int_type>(__p) != char_traits<char>::eof())
__v = __ld;
#endif
else
diff --git a/libstdc++-v3/include/std/std_ostream.h b/libstdc++-v3/include/std/std_ostream.h
index e3ec3260ec0d..3bb5e042e5ac 100644
--- a/libstdc++-v3/include/std/std_ostream.h
+++ b/libstdc++-v3/include/std/std_ostream.h
@@ -1,6 +1,7 @@
// Output streams -*- C++ -*-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -50,7 +51,6 @@ namespace std
class basic_ostream : virtual public basic_ios<_CharT, _Traits>
{
public:
-
// Types (inherited from basic_ios (27.4.4)):
typedef _CharT char_type;
typedef typename _Traits::int_type int_type;
--
GitLab