From: Benjamin Kosnik <bkoz@redhat.com>
Date: Tue, 12 Jun 2001 22:14:08 +0000 (+0000)
Subject: std_sstream.h: Add allocator_type, as per DR 251.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=30f69f71d874e39aea6d9114ecb048f285e704d5;p=gcc.git

std_sstream.h: Add allocator_type, as per DR 251.


2001-06-12  Benjamin Kosnik  <bkoz@redhat.com>

	libstdc++/3142
	* include/bits/std_sstream.h: Add allocator_type, as per DR 251.

	libstdc++/3141
	* include/bits/istream.tcc (getline, get): Fix as per DR 243.

	libstdc++/3140
	* include/bits/std_bitset.h (bitset::set): Fix as per DR 186.

	libstdc++/3139
	* include/bits/limits_generic.h: Fix as per DR 184.

From-SVN: r43273
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ccf316ff056..178a6918d8b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2001-06-12  Benjamin Kosnik  <bkoz@redhat.com>
+
+	libstdc++/3142
+	* include/bits/std_sstream.h: Add allocator_type, as per DR 251.
+
+	libstdc++/3141
+	* include/bits/istream.tcc (getline, get): Fix as per DR 243.
+
+	libstdc++/3140
+	* include/bits/std_bitset.h (bitset::set): Fix as per DR 186.
+
+	libstdc++/3139
+	* include/bits/limits_generic.h: Fix as per DR 184.
+
 2001-06-11  Benjamin Kosnik  <bkoz@redhat.com>
 
 	libstdc++/3126
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index e794fe33060..3d942b2feb6 100644
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -570,7 +570,7 @@ namespace std
 		__throw_exception_again;
 	    }
 	}
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
 	this->setstate(ios_base::failbit);
       return *this;
@@ -670,7 +670,7 @@ namespace std
 		__throw_exception_again;
 	    }
 	}
-      *__s = char_type(NULL);
+      *__s = char_type();
       if (!_M_gcount)
 	this->setstate(ios_base::failbit);
       return *this;
diff --git a/libstdc++-v3/include/bits/limits_generic.h b/libstdc++-v3/include/bits/limits_generic.h
index e25b6723b41..8ad003340b0 100644
--- a/libstdc++-v3/include/bits/limits_generic.h
+++ b/libstdc++-v3/include/bits/limits_generic.h
@@ -117,8 +117,8 @@ namespace std {
         static bool max() throw()
         { return true; }
 
-        static const int digits = 8;
-        static const int digits10 = 2;
+        static const int digits = 1;
+        static const int digits10 = 0;
         static const bool is_signed = false;
         static const bool is_integer = true;
         static const bool is_exact = true;
@@ -148,9 +148,9 @@ namespace std {
         static bool denorm_min() throw()
         { return static_cast<bool>(0); }
 
-        static const bool is_iec559 = true;
+        static const bool is_iec559 = false;
         static const bool is_bounded = true;
-        static const bool is_modulo = true;
+        static const bool is_modulo = false;
 
         static const bool traps = false;
         static const bool tinyness_before = false;
diff --git a/libstdc++-v3/include/bits/std_bitset.h b/libstdc++-v3/include/bits/std_bitset.h
index 1c868bccae9..eee8247af72 100644
--- a/libstdc++-v3/include/bits/std_bitset.h
+++ b/libstdc++-v3/include/bits/std_bitset.h
@@ -551,14 +551,7 @@ public:
     return *this;
   }
 
-  bitset<_Nb>& set(size_t __pos) {
-    if (__pos >= _Nb)
-      __STL_THROW(out_of_range("bitset"));
-
-    return _Unchecked_set(__pos);
-  }
-
-  bitset<_Nb>& set(size_t __pos, int __val) {
+  bitset<_Nb>& set(size_t __pos, bool __val = true) {
     if (__pos >= _Nb)
       __STL_THROW(out_of_range("bitset"));
 
diff --git a/libstdc++-v3/include/bits/std_sstream.h b/libstdc++-v3/include/bits/std_sstream.h
index ca347dc326c..bcae7ed2985 100644
--- a/libstdc++-v3/include/bits/std_sstream.h
+++ b/libstdc++-v3/include/bits/std_sstream.h
@@ -48,6 +48,10 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
+#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+// 251. basic_stringbuf missing allocator_type
+      typedef _Alloc				       	allocator_type;
+#endif
       typedef typename traits_type::int_type 		int_type;
       typedef typename traits_type::pos_type 		pos_type;
       typedef typename traits_type::off_type 		off_type;
@@ -194,6 +198,10 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
+#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+// 251. basic_stringbuf missing allocator_type
+      typedef _Alloc				       	allocator_type;
+#endif
       typedef typename traits_type::int_type 		int_type;
       typedef typename traits_type::pos_type 		pos_type;
       typedef typename traits_type::off_type 		off_type;
@@ -245,6 +253,10 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
+#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+// 251. basic_stringbuf missing allocator_type
+      typedef _Alloc				       	allocator_type;
+#endif
       typedef typename traits_type::int_type 		int_type;
       typedef typename traits_type::pos_type 		pos_type;
       typedef typename traits_type::off_type 		off_type;
@@ -296,6 +308,10 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
+#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+// 251. basic_stringbuf missing allocator_type
+      typedef _Alloc				       	allocator_type;
+#endif
       typedef typename traits_type::int_type 		int_type;
       typedef typename traits_type::pos_type 		pos_type;
       typedef typename traits_type::off_type 		off_type;
@@ -349,4 +365,3 @@ namespace std
 #endif
 
 #endif	// _CPP_SSTREAM
-