rpms/compat-gcc-32/devel compat-libstdc++33++-fully-dynamic-strings.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Dec 17 17:21:01 UTC 2005
Author: jakub
Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26314
Modified Files:
compat-libstdc++33++-fully-dynamic-strings.patch
Log Message:
3.2.3-54.fc5
compat-libstdc++33++-fully-dynamic-strings.patch:
basic_string.h | 4 ++++
basic_string.tcc | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
Index: compat-libstdc++33++-fully-dynamic-strings.patch
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-libstdc++33++-fully-dynamic-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libstdc++33++-fully-dynamic-strings.patch 17 Dec 2005 16:55:08 -0000 1.1
+++ compat-libstdc++33++-fully-dynamic-strings.patch 17 Dec 2005 17:20:58 -0000 1.2
@@ -18,10 +18,10 @@
// Avoid reallocation for common case.
_CharT __buf[100];
size_type __i = 0;
-@@ -139,11 +141,13 @@ namespace std
+@@ -137,11 +139,13 @@ namespace std
+ _S_construct(_InIter __beg, _InIter __end, const _Alloc& __a,
+ forward_iterator_tag)
{
- size_type __dnew = static_cast<size_type>(distance(__beg, __end));
-
+#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
if (__beg == __end && __a == _Alloc())
return _S_empty_rep()._M_refcopy();
@@ -31,8 +31,8 @@
- if (__builtin_expect(__beg == _InIter(), 0))
+ if (__builtin_expect(__beg == _InIter() && __beg != __end, 0))
__throw_logic_error("attempt to create string with null pointer");
-
- // Check for out_of_range and length_error exceptions.
+
+ size_type __dnew = static_cast<size_type>(std::distance(__beg, __end));
@@ -166,8 +170,10 @@ namespace std
basic_string<_CharT, _Traits, _Alloc>::
_S_construct(size_type __n, _CharT __c, const _Alloc& __a)
More information about the fedora-cvs-commits
mailing list