diff options
| author | oliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-11-27 12:10:39 +0000 |
|---|---|---|
| committer | oliva <oliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-11-27 12:10:39 +0000 |
| commit | b54aed5205a7405a638f551ee5dfdccc38c74d36 (patch) | |
| tree | 96cd812e0e8be612226b4c7df3082f24375ae89d /libstdc++/stl/bitset | |
| parent | 2144ed53c64b6846c4c25e6a4743e7b27c48d21e (diff) | |
| download | gcc-b54aed5205a7405a638f551ee5dfdccc38c74d36.tar.gz | |
* bitset: explicitly convert basic_string<...>::npos to size_t in
default argument to constructor, to avoid parse error at `>'
(__STL_EXPLICIT_FUNCTION_TMPL_ARGS): replace #if with #ifdef
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23937 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++/stl/bitset')
| -rw-r--r-- | libstdc++/stl/bitset | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++/stl/bitset b/libstdc++/stl/bitset index 5660855b059..64fa5959232 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; |