aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@unitus.it>2001-12-10 15:32:28 +0100
committerPaolo Carlini <paolo@gcc.gnu.org>2001-12-10 14:32:28 +0000
commitd01f3474229a6b3b89085ff009ba85515c95b285 (patch)
tree7202786ad7779526813e1615b88b63283deb18cd
parent6fc5dc671c5649cdf2d80f00c6dcc127e9b29442 (diff)
downloadgcc-d01f3474229a6b3b89085ff009ba85515c95b285.zip
gcc-d01f3474229a6b3b89085ff009ba85515c95b285.tar.gz
gcc-d01f3474229a6b3b89085ff009ba85515c95b285.tar.bz2
basic_string.tcc (_M_replace_safe): Fix typos.
2001-12-10 Paolo Carlini <pcarlini@unitus.it> * include/bits/basic_string.tcc (_M_replace_safe): Fix typos. * include/bits/basic_string.h: Fix typos. From-SVN: r47847
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/basic_string.h6
-rw-r--r--libstdc++-v3/include/bits/basic_string.tcc6
3 files changed, 11 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d12a7e2..a67c6aa 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,9 @@
2001-12-10 Paolo Carlini <pcarlini@unitus.it>
+
+ * include/bits/basic_string.tcc (_M_replace_safe): Fix typos.
+ * include/bits/basic_string.h: Fix typos.
+
+2001-12-10 Paolo Carlini <pcarlini@unitus.it>
Nathan Myers <ncm@cantrip.org>
* include/bits/basic_string.tcc (_M_replace_safe): New function.
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 406d71c..6f9afe1 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -639,10 +639,10 @@ namespace std
_M_replace(iterator __i1, iterator __i2, _InputIterator __k1,
_InputIterator __k2, input_iterator_tag);
- template<class _InputIterator>
+ template<class _ForwardIterator>
basic_string&
- _M_replace_safe(iterator __i1, iterator __i2, _InputIterator __k1,
- _InputIterator __k2);
+ _M_replace_safe(iterator __i1, iterator __i2, _ForwardIterator __k1,
+ _ForwardIterator __k2);
// _S_construct_aux is used to implement the 21.3.1 para 15 which
// requires special behaviour if _InIter is an integral type
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc
index 57a5191..69638e2 100644
--- a/libstdc++-v3/include/bits/basic_string.tcc
+++ b/libstdc++-v3/include/bits/basic_string.tcc
@@ -514,11 +514,11 @@ namespace std
// i.e., when source and destination ranges are known to not overlap.
// Presently, is called by _M_replace and by the various append.
template<typename _CharT, typename _Traits, typename _Alloc>
- template<typename _InputIter>
+ template<typename _ForwardIter>
basic_string<_CharT, _Traits, _Alloc>&
basic_string<_CharT, _Traits, _Alloc>::
- _M_replace_safe(iterator __i1, iterator __i2, _InputIter __k1,
- _InputIter __k2)
+ _M_replace_safe(iterator __i1, iterator __i2, _ForwardIter __k1,
+ _ForwardIter __k2)
{
size_type __dnew = static_cast<size_type>(distance(__k1, __k2));
size_type __dold = __i2 - __i1;