summaryrefslogtreecommitdiffstats
path: root/contrib/libstdc++/include/bits
diff options
context:
space:
mode:
authorkan <kan@FreeBSD.org>2002-10-10 04:40:44 +0000
committerkan <kan@FreeBSD.org>2002-10-10 04:40:44 +0000
commit05dc917ee76e021c62a5523736d072a864a1e558 (patch)
treea7ab11963cdd5ff6bbcbb9d530cfdd929f370237 /contrib/libstdc++/include/bits
parent92318bc515d223b2eeebb665f76e131dd2318b2b (diff)
downloadFreeBSD-src-05dc917ee76e021c62a5523736d072a864a1e558.zip
FreeBSD-src-05dc917ee76e021c62a5523736d072a864a1e558.tar.gz
Gcc 3.2.1-prerelease C++ support bits from the FSF anoncvs repo gcc-3_2-branch on October 9th 2002 20:15 EST.
Diffstat (limited to 'contrib/libstdc++/include/bits')
-rw-r--r--contrib/libstdc++/include/bits/c++config2
-rw-r--r--contrib/libstdc++/include/bits/codecvt.h2
-rw-r--r--contrib/libstdc++/include/bits/locale_facets.tcc4
-rw-r--r--contrib/libstdc++/include/bits/stl_deque.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/contrib/libstdc++/include/bits/c++config b/contrib/libstdc++/include/bits/c++config
index b440c68..41c3ba8 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 423679a..3666e98 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 195d33a..f21054e 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 ce6be7e..cbe8779 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)
OpenPOWER on IntegriCloud