diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2002-02-16 02:41:10 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2002-02-16 02:41:10 +0000 |
| commit | b4cce2533b189c4cbe7f398b0ae3bd828c22ea57 (patch) | |
| tree | 938b027b50786cadb086e1e2dec0e45d003b83ee | |
| parent | c7bbe0c45e7e45b245cd2b9b6b4dd87efce71901 (diff) | |
| download | gcc-b4cce2533b189c4cbe7f398b0ae3bd828c22ea57.zip gcc-b4cce2533b189c4cbe7f398b0ae3bd828c22ea57.tar.gz gcc-b4cce2533b189c4cbe7f398b0ae3bd828c22ea57.tar.bz2 | |
std_iosfwd.h: Don't guard typedefs with _GLIBCPP_USE_WCHAR_T
2002-02-15 Benjamin Kosnik <bkoz@redhat.com>
* include/std/std_iosfwd.h: Don't guard typedefs with
_GLIBCPP_USE_WCHAR_T
* include/bits/stringfwd.h: Same.
From-SVN: r49800
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stringfwd.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/std_iosfwd.h | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 511d313..d52cefe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2002-02-15 Benjamin Kosnik <bkoz@redhat.com> + * include/std/std_iosfwd.h: Don't guard typedefs with + _GLIBCPP_USE_WCHAR_T + * include/bits/stringfwd.h: Same. + +2002-02-15 Benjamin Kosnik <bkoz@redhat.com> + * src/locale.cc (moneypunct_byname): Remove definitions. * include/std/std_streambuf.h (streambuf::operator=): Return. diff --git a/libstdc++-v3/include/bits/stringfwd.h b/libstdc++-v3/include/bits/stringfwd.h index 5197f97..b7418a6 100644 --- a/libstdc++-v3/include/bits/stringfwd.h +++ b/libstdc++-v3/include/bits/stringfwd.h @@ -1,6 +1,6 @@ // String support -*- C++ -*- -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -61,13 +61,7 @@ namespace std class basic_string; typedef basic_string<char> string; -#ifdef _GLIBCPP_USE_WCHAR_T typedef basic_string<wchar_t> wstring; -#endif } // namespace std #endif // _CPP_BITS_STRINGFWD_H - -// Local Variables: -// mode:c++ -// End: diff --git a/libstdc++-v3/include/std/std_iosfwd.h b/libstdc++-v3/include/std/std_iosfwd.h index 797f493..f76ca7c 100644 --- a/libstdc++-v3/include/std/std_iosfwd.h +++ b/libstdc++-v3/include/std/std_iosfwd.h @@ -116,7 +116,6 @@ namespace std typedef basic_ofstream<char> ofstream; typedef basic_fstream<char> fstream; -#ifdef _GLIBCPP_USE_WCHAR_T typedef basic_ios<wchar_t> wios; typedef basic_streambuf<wchar_t> wstreambuf; typedef basic_istream<wchar_t> wistream; @@ -130,7 +129,6 @@ namespace std typedef basic_ifstream<wchar_t> wifstream; typedef basic_ofstream<wchar_t> wofstream; typedef basic_fstream<wchar_t> wfstream; -#endif } // namespace std #endif |