From b554ce2f9489d77acb0aa2f299d7088556348f72 Mon Sep 17 00:00:00 2001
From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 11 Apr 1999 22:53:05 +0000
Subject: [PATCH] * bitset: Re-install Alexandre's lost patch from
1998-11-27.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26354 138bc75d-0d04-0410-961f-82ee72b054a4
---
libstdc++/stl/ChangeLog | 4 ++++
libstdc++/stl/bitset | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index 40e8c36e98fa..79dbea55a135 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 36edf09659e8..e26845ed0455 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;
--
GitLab