diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 511d3131cc5b..d52cefed50bb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-02-15 Benjamin Kosnik + + * include/std/std_iosfwd.h: Don't guard typedefs with + _GLIBCPP_USE_WCHAR_T + * include/bits/stringfwd.h: Same. + 2002-02-15 Benjamin Kosnik * src/locale.cc (moneypunct_byname): Remove definitions. diff --git a/libstdc++-v3/include/bits/stringfwd.h b/libstdc++-v3/include/bits/stringfwd.h index 5197f9703fdb..b7418a67a7ea 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 string; -#ifdef _GLIBCPP_USE_WCHAR_T typedef basic_string 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 797f4936dc8a..f76ca7cad706 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 ofstream; typedef basic_fstream fstream; -#ifdef _GLIBCPP_USE_WCHAR_T typedef basic_ios wios; typedef basic_streambuf wstreambuf; typedef basic_istream wistream; @@ -130,7 +129,6 @@ namespace std typedef basic_ifstream wifstream; typedef basic_ofstream wofstream; typedef basic_fstream wfstream; -#endif } // namespace std #endif