diff options
| author | Jeffrey A Law <law@cygnus.com> | 1999-04-11 22:53:05 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-04-11 16:53:05 -0600 |
| commit | 1bd0b556b421ac098196cd4889f50eac23d5394d (patch) | |
| tree | edab1cf4496bbfca37371fd2f856d6b777c2ef64 | |
| parent | 2bcf042cce2f484a0e7ba385b597a6bfb4af8005 (diff) | |
| download | gcc-1bd0b556b421ac098196cd4889f50eac23d5394d.tar.gz | |
* bitset: Re-install Alexandre's lost patch from 1998-11-27.
From-SVN: r26354
| -rw-r--r-- | libstdc++/stl/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++/stl/bitset | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog index 40e8c36e98f..79dbea55a13 100644 --- a/libstdc++/stl/ChangeLog +++ b/libstdc++/stl/ChangeLog @@ -1,3 +1,7 @@ +Sun Apr 11 23:48:30 1999 Jeffrey A Law (law@cygnus.com) + + * bitset: Re-install Alexandre's lost patch from 1998-11-27. + 1999-01-20 Ulrich Drepper <drepper@cygnus.com> * stl_construct.h (__destroy_aux): Use != instead of < for diff --git a/libstdc++/stl/bitset b/libstdc++/stl/bitset index 36edf09659e..e26845ed045 100644 --- a/libstdc++/stl/bitset +++ b/libstdc++/stl/bitset @@ -626,7 +626,7 @@ public: template<class _CharT, class _Traits, class _Alloc> explicit bitset(const basic_string<_CharT,_Traits,_Alloc>& __s, size_t __pos = 0, - size_t __n = basic_string<_CharT,_Traits,_Alloc>::npos) + size_t __n = size_t(basic_string<_CharT,_Traits,_Alloc>::npos)) : _Base() { if (__pos > __s.size()) @@ -753,7 +753,7 @@ public: unsigned long to_ulong() const { return _M_do_to_ulong(); } -#if __STL_EXPLICIT_FUNCTION_TMPL_ARGS +#ifdef __STL_EXPLICIT_FUNCTION_TMPL_ARGS template <class _CharT, class _Traits, class _Alloc> basic_string<_CharT, _Traits, _Alloc> to_string() const { basic_string<_CharT, _Traits, _Alloc> __result; |