diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-03-06 18:06:47 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-03-06 18:06:47 +0000 |
| commit | e3dfd6d5558ea8f9e0834f843803812955ba3c25 (patch) | |
| tree | 7ba9fc2fe53da0e7be90104eaec93d11dd7d0a63 /libstdc++-v3/src | |
| parent | 7d14f0fcec5a42b1a532f616ea57abb86c54b5f3 (diff) | |
| download | gcc-e3dfd6d5558ea8f9e0834f843803812955ba3c25.zip gcc-e3dfd6d5558ea8f9e0834f843803812955ba3c25.tar.gz gcc-e3dfd6d5558ea8f9e0834f843803812955ba3c25.tar.bz2 | |
re PR target/26532 (libmudflap failures on ia64)
2006-03-06 Paolo Carlini <pcarlini@suse.de>
PR target/26532
* config/io/c_io_stdio.h (struct __ios_flags): Remove.
* include/bits/ios_base.h: Adjust consistently.
(ios_base::_S_local_word_size): Change to an anonymous enum.
* src/ios.cc: Do not define static const data of __ios_flags,
likewise for ios_base::_S_local_word_size.
* include/bits/locale_classes.h (locale::_S_categories_size):
Change to an anonymous enum.
* src/locale.cc: Don't define.
From-SVN: r111789
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/ios.cc | 36 | ||||
| -rw-r--r-- | libstdc++-v3/src/locale.cc | 1 |
2 files changed, 1 insertions, 36 deletions
diff --git a/libstdc++-v3/src/ios.cc b/libstdc++-v3/src/ios.cc index fdc62b4..5b05f28 100644 --- a/libstdc++-v3/src/ios.cc +++ b/libstdc++-v3/src/ios.cc @@ -1,6 +1,6 @@ // Iostreams base classes -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -38,38 +38,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) - // XXX GLIBCXX_ABI Deprecated - // Definitions for static const data members of __ios_flags. - const __ios_flags::__int_type __ios_flags::_S_boolalpha; - const __ios_flags::__int_type __ios_flags::_S_dec; - const __ios_flags::__int_type __ios_flags::_S_fixed; - const __ios_flags::__int_type __ios_flags::_S_hex; - const __ios_flags::__int_type __ios_flags::_S_internal; - const __ios_flags::__int_type __ios_flags::_S_left; - const __ios_flags::__int_type __ios_flags::_S_oct; - const __ios_flags::__int_type __ios_flags::_S_right; - const __ios_flags::__int_type __ios_flags::_S_scientific; - const __ios_flags::__int_type __ios_flags::_S_showbase; - const __ios_flags::__int_type __ios_flags::_S_showpoint; - const __ios_flags::__int_type __ios_flags::_S_showpos; - const __ios_flags::__int_type __ios_flags::_S_skipws; - const __ios_flags::__int_type __ios_flags::_S_unitbuf; - const __ios_flags::__int_type __ios_flags::_S_uppercase; - const __ios_flags::__int_type __ios_flags::_S_adjustfield; - const __ios_flags::__int_type __ios_flags::_S_basefield; - const __ios_flags::__int_type __ios_flags::_S_floatfield; - - const __ios_flags::__int_type __ios_flags::_S_badbit; - const __ios_flags::__int_type __ios_flags::_S_eofbit; - const __ios_flags::__int_type __ios_flags::_S_failbit; - - const __ios_flags::__int_type __ios_flags::_S_app; - const __ios_flags::__int_type __ios_flags::_S_ate; - const __ios_flags::__int_type __ios_flags::_S_bin; - const __ios_flags::__int_type __ios_flags::_S_in; - const __ios_flags::__int_type __ios_flags::_S_out; - const __ios_flags::__int_type __ios_flags::_S_trunc; - // Definitions for static const members of ios_base. const ios_base::fmtflags ios_base::boolalpha; const ios_base::fmtflags ios_base::dec; @@ -106,8 +74,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const ios_base::seekdir ios_base::cur; const ios_base::seekdir ios_base::end; - const int ios_base::_S_local_word_size; - _Atomic_word ios_base::Init::_S_refcount; bool ios_base::Init::_S_synced_with_stdio = true; diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index 7f54ab8..c56ec51 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -71,7 +71,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // These are no longer exported. locale::_Impl* locale::_S_classic; locale::_Impl* locale::_S_global; - const size_t locale::_S_categories_size; #ifdef __GTHREADS __gthread_once_t locale::_S_once = __GTHREAD_ONCE_INIT; |