diff options
| author | Ulrich Drepper <drepper@cygnus.com> | 1999-05-07 10:13:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@cygnus.com> | 1999-05-07 10:13:49 +0000 |
| commit | 80125ad986c789532e9005be6b5dbb5d569e7fa1 (patch) | |
| tree | baa136b6ab291d88694307fee7ba164ccd75cac4 | |
| parent | 34c8a007c50fc9053c550c3ef8555d21a3847574 (diff) | |
Make it possible to compile with __USE_MALLOC.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@26818 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++/stl/stl_alloc.h | 10 | ||||
| -rw-r--r-- | libstdc++/stlinst.cc | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++/stl/stl_alloc.h b/libstdc++/stl/stl_alloc.h index 51115b23482..208309a389b 100644 --- a/libstdc++/stl/stl_alloc.h +++ b/libstdc++/stl/stl_alloc.h @@ -894,6 +894,7 @@ inline bool operator!=(const __malloc_alloc_template<__inst>&, } #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */ +#ifndef __USE_MALLOC template <bool __threads, int __inst> inline bool operator==(const __default_alloc_template<__threads, __inst>&, const __default_alloc_template<__threads, __inst>&) @@ -901,14 +902,15 @@ inline bool operator==(const __default_alloc_template<__threads, __inst>&, return true; } -#ifdef __STL_FUNCTION_TMPL_PARTIAL_ORDER +# ifdef __STL_FUNCTION_TMPL_PARTIAL_ORDER template <bool __threads, int __inst> inline bool operator!=(const __default_alloc_template<__threads, __inst>&, const __default_alloc_template<__threads, __inst>&) { return false; } -#endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */ +# endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */ +#endif template <class _Alloc> inline bool operator==(const debug_alloc<_Alloc>&, @@ -983,6 +985,7 @@ struct _Alloc_traits<_Tp, __malloc_alloc_template<__inst> > typedef __allocator<_Tp, __malloc_alloc_template<__inst> > allocator_type; }; +#ifndef __USE_MALLOC template <class _Tp, bool __threads, int __inst> struct _Alloc_traits<_Tp, __default_alloc_template<__threads, __inst> > { @@ -992,6 +995,7 @@ struct _Alloc_traits<_Tp, __default_alloc_template<__threads, __inst> > typedef __allocator<_Tp, __default_alloc_template<__threads, __inst> > allocator_type; }; +#endif template <class _Tp, class _Alloc> struct _Alloc_traits<_Tp, debug_alloc<_Alloc> > @@ -1013,6 +1017,7 @@ struct _Alloc_traits<_Tp, typedef __allocator<_Tp, __malloc_alloc_template<__inst> > allocator_type; }; +#ifndef __USE_MALLOC template <class _Tp, class _Tp1, bool __thr, int __inst> struct _Alloc_traits<_Tp, __allocator<_Tp1, @@ -1024,6 +1029,7 @@ struct _Alloc_traits<_Tp, typedef __allocator<_Tp, __default_alloc_template<__thr,__inst> > allocator_type; }; +#endif template <class _Tp, class _Tp1, class _Alloc> struct _Alloc_traits<_Tp, __allocator<_Tp1, debug_alloc<_Alloc> > > diff --git a/libstdc++/stlinst.cc b/libstdc++/stlinst.cc index b71dc7ea09a..2a221fbaee9 100644 --- a/libstdc++/stlinst.cc +++ b/libstdc++/stlinst.cc @@ -3,6 +3,8 @@ #include <alloc.h> +#ifndef __USE_MALLOC template class __default_alloc_template<__NODE_ALLOCATOR_THREADS, 0>; +#endif template class __malloc_alloc_template<0>; |