diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2002-04-17 20:08:18 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2002-04-17 20:08:18 +0000 |
| commit | cff577891395c0a0bb9872e1661098095d45b5d6 (patch) | |
| tree | 88672d7735a0d5a97349c5ca34b14adf618ac254 | |
| parent | 94164032646b8a2a41cc6f61d4b5b3add53c5bc2 (diff) | |
| download | gcc-cff577891395c0a0bb9872e1661098095d45b5d6.zip gcc-cff577891395c0a0bb9872e1661098095d45b5d6.tar.gz gcc-cff577891395c0a0bb9872e1661098095d45b5d6.tar.bz2 | |
linker-map.gnu (__malloc_alloc_template): Add.
2002-04-17 Benjamin Kosnik <bkoz@redhat.com>
* config/linker-map.gnu (__malloc_alloc_template): Add.
(__default_alloc_template): Same.
* include/bits/stl_alloc.h (__malloc_alloc_template): Add extern
template.
(__default_alloc_template): Same.
From-SVN: r52441
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/config/linker-map.gnu | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_alloc.h | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 831e14d..741e887 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2002-04-17 Benjamin Kosnik <bkoz@redhat.com> + * config/linker-map.gnu (__malloc_alloc_template): Add. + (__default_alloc_template): Same. + * include/bits/stl_alloc.h (__malloc_alloc_template): Add extern + template. + (__default_alloc_template): Same. + +2002-04-17 Benjamin Kosnik <bkoz@redhat.com> + * testsuite/27_io/filebuf_virtuals.cc: Add _S_pback_size instantiation. 2002-04-16 Benjamin Kosnik <bkoz@redhat.com> diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu index 0a87f3d7..2a55bb2 100644 --- a/libstdc++-v3/config/linker-map.gnu +++ b/libstdc++-v3/config/linker-map.gnu @@ -36,7 +36,9 @@ GLIBCPP_3.1 { std::__timepunct*; std::__numeric_limits_base*; std::_S_bit_count; - std::_S_first_one + std::_S_first_one; + std::__default_alloc_template*; + std::__malloc_alloc_template* }; # Names not in an 'extern' block are mangled names. diff --git a/libstdc++-v3/include/bits/stl_alloc.h b/libstdc++-v3/include/bits/stl_alloc.h index e193297..7c34000 100644 --- a/libstdc++-v3/include/bits/stl_alloc.h +++ b/libstdc++-v3/include/bits/stl_alloc.h @@ -927,6 +927,11 @@ struct _Alloc_traits<_Tp, __allocator<_Tp1, __debug_alloc<_Alloc> > > // NB: This syntax is a GNU extension. extern template class allocator<char>; extern template class allocator<wchar_t>; +#ifdef __USE_MALLOC + extern template class __malloc_alloc_template<0>; +#else + extern template class __default_alloc_template<true, 0>; +#endif } // namespace std #endif /* __GLIBCPP_INTERNAL_ALLOC_H */ |