4 files changed, 6 insertions, 4 deletions
diff --git a/contrib/libstdc++/include/bits/c++config b/contrib/libstdc++/include/bits/c++config
index b440c68c39ddf..41c3ba80b1ada 100644
--- a/contrib/libstdc++/include/bits/c++config
+++ b/contrib/libstdc++/include/bits/c++config
@@ -34,7 +34,7 @@
 #include <bits/os_defines.h>
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCPP__ 20020916
+#define __GLIBCPP__ 20021009
 
 // This is necessary until GCC supports separate template
 // compilation.  
diff --git a/contrib/libstdc++/include/bits/codecvt.h b/contrib/libstdc++/include/bits/codecvt.h
index 423679a5ab023..3666e987d6deb 100644
--- a/contrib/libstdc++/include/bits/codecvt.h
+++ b/contrib/libstdc++/include/bits/codecvt.h
@@ -320,7 +320,7 @@
     {
     public:
       explicit 
-      codecvt_byname(const char* __s, size_t __refs = 0) 
+      codecvt_byname(const char*, size_t __refs = 0) 
       : codecvt<_InternT, _ExternT, _StateT>(__refs) { }
 
     protected:
diff --git a/contrib/libstdc++/include/bits/locale_facets.tcc b/contrib/libstdc++/include/bits/locale_facets.tcc
index 195d33ab04073..f21054e29663f 100644
--- a/contrib/libstdc++/include/bits/locale_facets.tcc
+++ b/contrib/libstdc++/include/bits/locale_facets.tcc
@@ -798,8 +798,10 @@ namespace std
 	  // By itself __add_grouping cannot deal correctly with __ws when
 	  // ios::showbase is set and ios_base::oct || ios_base::hex.
 	  // Therefore we take care "by hand" of the initial 0, 0x or 0X.
+	  // However, remember that the latter do not occur if the number
+	  // printed is '0' (__len == 1).
 	  streamsize __off = 0;
-	  if (__io.flags() & ios_base::showbase)
+	  if ((__io.flags() & ios_base::showbase) && __len > 1)
 	    if (__basefield == ios_base::oct)
 	      {
 		__off = 1;
diff --git a/contrib/libstdc++/include/bits/stl_deque.h b/contrib/libstdc++/include/bits/stl_deque.h
index ce6be7e4ce2f5..cbe87796770f0 100644
--- a/contrib/libstdc++/include/bits/stl_deque.h
+++ b/contrib/libstdc++/include/bits/stl_deque.h
@@ -665,7 +665,7 @@ public:                         // Basic accessors
 
   void _M_range_check(size_type __n) const {
     if (__n >= this->size())
-      __throw_range_error("deque");
+      __throw_out_of_range("deque");
   }
 
   reference at(size_type __n)