diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f705ff2ce68..80c87092f6a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2000-11-12 Brent Verner + + * include/c_std/bits/wrap_langinfo.h: New file. + * include/c_std/langinfo.h: New file. + * include/bits/codecvt.h (__enc_trants::__enc_traits()): Bring in + CODESET from _C_legacy::CODESET if using shadow headers. + 2000-11-12 Mark Mitchell * include/c/bits/std_cmath.h (abs): Change extern "C" declaration @@ -7,7 +14,7 @@ * config/os/solaris/solaris2.7/bits/os_defines.h: Define __EXTENSIONS__. -Sat Nov 11 20:25:49 2000 Mark P Mitchell +2000-11-11 Mark P Mitchell * include/bits/basic_file.h (__basic_file): Don't use __c_wfile_type when _GLIBCPP_USE_WCHAR_T is not defined. diff --git a/libstdc++-v3/include/bits/codecvt.h b/libstdc++-v3/include/bits/codecvt.h index 97fc015509c..c8ec65a28dd 100644 --- a/libstdc++-v3/include/bits/codecvt.h +++ b/libstdc++-v3/include/bits/codecvt.h @@ -46,13 +46,20 @@ namespace std { - // XXX __enc_traits may need to move up the locale header hierarchy, + // XXX + // __enc_traits may need to move up the locale header hierarchy, // depending on if ctype ends up using it. + #ifdef _GLIBCPP_USE_WCHAR_T // Extensions to use icov for dealing with character encodings, // including conversions and comparisons between various character // sets. This object encapsulates data that may need to be shared between // char_traits, codecvt and ctype. + +#if _GLIBCPP_USE_SHADOW_HEADERS + using _C_legacy::CODESET; +#endif + class __enc_traits { public: diff --git a/libstdc++-v3/include/c_std/bits/wrap_langinfo.h b/libstdc++-v3/include/c_std/bits/wrap_langinfo.h new file mode 100644 index 00000000000..138faa10d77 --- /dev/null +++ b/libstdc++-v3/include/c_std/bits/wrap_langinfo.h @@ -0,0 +1,49 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 2000 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 20.5 Extensions +// + +#ifndef _CPP_WRAP_LANGINFO_H +#define _CPP_WRAP_LANGINFO_H 1 + +namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# pragma GCC system_header +# include_next + } +} // namespace _C_legacy + +# undef _IN_C_LEGACY_ + +#endif + + diff --git a/libstdc++-v3/include/c_std/langinfo.h b/libstdc++-v3/include/c_std/langinfo.h new file mode 100644 index 00000000000..3333ef15c81 --- /dev/null +++ b/libstdc++-v3/include/c_std/langinfo.h @@ -0,0 +1,55 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 2000 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _INCLUDED_CPP_LANGINFO_H_ +# define _INCLUDED_CPP_LANGINFO_H_ 1 + +# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ + // get out of the "legacy" + } // close extern "C" + } // close namespace _C_legacy:: +# undef _IN_C_LEGACY_ +# define _LANGINFO_NEED_C_LEGACY_ +# endif + +# include + +# ifdef _LANGINFO_NEED_C_LEGACY_ + // dive back into the "swamp" + namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# undef _LANGINFO_NEED_C_LEGACY_ +# endif /* _LANGINFO_NEED_C_LEGACY_ */ +#endif /* _INCLUDED_CPP_LANGINFO_H_ */ + + + +