From cff577891395c0a0bb9872e1661098095d45b5d6 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 17 Apr 2002 20:08:18 +0000 Subject: [PATCH] linker-map.gnu (__malloc_alloc_template): Add. 2002-04-17 Benjamin Kosnik * 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 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/config/linker-map.gnu | 4 +++- libstdc++-v3/include/bits/stl_alloc.h | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 831e14dc731..741e887d094 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2002-04-17 Benjamin Kosnik + + * 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 * testsuite/27_io/filebuf_virtuals.cc: Add _S_pback_size instantiation. diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu index 0a87f3d79bc..2a55bb2e463 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 e193297513c..7c34000401c 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; extern template class allocator; +#ifdef __USE_MALLOC + extern template class __malloc_alloc_template<0>; +#else + extern template class __default_alloc_template; +#endif } // namespace std #endif /* __GLIBCPP_INTERNAL_ALLOC_H */ -- 2.30.2