OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make it possible to compile with __USE_MALLOC. 

From-SVN: r26818
This commit is contained in:
Ulrich Drepper 1999-05-07 10:13:49 +00:00
parent ef179a2644
commit 2370ed1f56
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++/stl/stl_alloc.h
View File

@ -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> > >

2
libstdc++/stlinst.cc
View File

@ -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>;