2006-04-11 Paolo Carlini <pcarlini@suse.de>

	Merge mainline changes from revision 110045 to 110697.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/libstdcxx_so_7-branch@112854 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 10 insertions, 57 deletions

diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h
index ad47238ed62..bea36e28ea6 100644
--- a/libstdc++-v3/include/std/std_bitset.h
+++ b/libstdc++-v3/include/std/std_bitset.h
@@ -1,6 +1,7 @@
 // <bitset> -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -1157,7 +1158,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD)
 	      case '0':
 		break;
 	      case '1':
-		set(__i - 1);
+		_Unchecked_set(__i - 1);
 		break;
 	      default:
 		__throw_invalid_argument(__N("bitset::_M_copy_from_string"));
diff --git a/libstdc++-v3/include/std/std_istream.h b/libstdc++-v3/include/std/std_istream.h
index 659d3e2a2d7..862793e9ffe 100644
--- a/libstdc++-v3/include/std/std_istream.h
+++ b/libstdc++-v3/include/std/std_istream.h
@@ -1,6 +1,6 @@
 // Input streams -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -170,45 +170,15 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       { return _M_extract(__n); }
       
       __istream_type& 
-      operator>>(short& __n)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 118. basic_istream uses nonexistent num_get member functions.
-	long __l;
-	_M_extract(__l);
-	if (!this->fail())
-	  {
-	    if (numeric_limits<short>::min() <= __l
-		&& __l <= numeric_limits<short>::max())
-	      __n = __l;
-	    else
-	      this->setstate(ios_base::failbit);
-	  }
-	return *this;
-      }
+      operator>>(short& __n);
       
       __istream_type& 
       operator>>(unsigned short& __n)
       { return _M_extract(__n); }
 
       __istream_type& 
-      operator>>(int& __n)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 118. basic_istream uses nonexistent num_get member functions.
-	long __l;
-	_M_extract(__l);
-	if (!this->fail())
-	  {
-	    if (numeric_limits<int>::min() <= __l
-		&& __l <= numeric_limits<int>::max())
-	      __n = __l;
-	    else
-	      this->setstate(ios_base::failbit);
-	  }
-	return *this;
-      }
-     
+      operator>>(int& __n);
+    
       __istream_type& 
       operator>>(unsigned int& __n)
       { return _M_extract(__n); }
diff --git a/libstdc++-v3/include/std/std_ostream.h b/libstdc++-v3/include/std/std_ostream.h
index 8dc398ed0ef..23a19c98d32 100644
--- a/libstdc++-v3/include/std/std_ostream.h
+++ b/libstdc++-v3/include/std/std_ostream.h
@@ -1,6 +1,6 @@
 // Output streams -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -176,16 +176,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       { return _M_insert(__n); }
 
       __ostream_type& 
-      operator<<(short __n)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 117. basic_ostream uses nonexistent num_put member functions.
-	const ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-	if (__fmt == ios_base::oct || __fmt == ios_base::hex)
-	  return _M_insert(static_cast<long>(static_cast<unsigned short>(__n)));
-	else
-	  return _M_insert(static_cast<long>(__n));
-      }
+      operator<<(short __n);
 
       __ostream_type& 
       operator<<(unsigned short __n)
@@ -196,16 +187,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       }
 
       __ostream_type& 
-      operator<<(int __n)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 117. basic_ostream uses nonexistent num_put member functions.
-	const ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-	if (__fmt == ios_base::oct || __fmt == ios_base::hex)
-	  return _M_insert(static_cast<long>(static_cast<unsigned int>(__n)));
-	else
-	  return _M_insert(static_cast<long>(__n));
-      }
+      operator<<(int __n);
 
       __ostream_type& 
       operator<<(unsigned int __n)