aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2004-02-01 22:14:43 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2004-02-01 22:14:43 +0000
commit64ebadacc4ee75f95596174273b89bebbc0dfb01 (patch)
tree2f8afd5ab3830ba1419d9ef79abf327787979629
parentf1c25d3b47cbca1052d3f6b91a915f981180307c (diff)
downloadgcc-64ebadacc4ee75f95596174273b89bebbc0dfb01.zip
gcc-64ebadacc4ee75f95596174273b89bebbc0dfb01.tar.gz
gcc-64ebadacc4ee75f95596174273b89bebbc0dfb01.tar.bz2
vector.tcc (vector::_M_insert_aux(iterator)): Remove, unused.
2004-02-01 Paolo Carlini <pcarlini@suse.de> * include/bits/vector.tcc (vector::_M_insert_aux(iterator)): Remove, unused. From-SVN: r77081
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/vector.tcc46
2 files changed, 6 insertions, 45 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a8bdc26..cef5af5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2004-02-01 Paolo Carlini <pcarlini@suse.de>
+ * include/bits/vector.tcc (vector::_M_insert_aux(iterator)):
+ Remove, unused.
+
+2004-02-01 Paolo Carlini <pcarlini@suse.de>
+
* include/bits/stl_function.h: Additional minor tweaks.
2004-02-01 Paolo Carlini <pcarlini@suse.de>
diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc
index caa2762..ee7e85c 100644
--- a/libstdc++-v3/include/bits/vector.tcc
+++ b/libstdc++-v3/include/bits/vector.tcc
@@ -268,51 +268,7 @@ namespace __gnu_norm
this->_M_end_of_storage = __new_start.base() + __len;
}
}
-
- #ifdef _GLIBCXX_DEPRECATED
- template<typename _Tp, typename _Alloc>
- void
- vector<_Tp,_Alloc>::
- _M_insert_aux(iterator __position)
- {
- if (_M_finish != _M_end_of_storage)
- {
- std::_Construct(_M_finish, *(_M_finish - 1));
- ++_M_finish;
- std::copy_backward(__position, iterator(_M_finish - 2),
- iterator(_M_finish - 1));
- *__position = value_type();
- }
- else
- {
- const size_type __old_size = size();
- const size_type __len = __old_size != 0 ? 2 * __old_size : 1;
- pointer __new_start = _M_allocate(__len);
- pointer __new_finish = __new_start;
- try
- {
- __new_finish = std::uninitialized_copy(iterator(_M_start), __position,
- __new_start);
- std::_Construct(__new_finish);
- ++__new_finish;
- __new_finish = std::uninitialized_copy(__position, iterator(_M_finish),
- __new_finish);
- }
- catch(...)
- {
- std::_Destroy(__new_start,__new_finish);
- _M_deallocate(__new_start,__len);
- __throw_exception_again;
- }
- std::_Destroy(begin(), end());
- _M_deallocate(_M_start, _M_end_of_storage - _M_start);
- _M_start = __new_start;
- _M_finish = __new_finish;
- _M_end_of_storage = __new_start + __len;
- }
- }
- #endif
-
+
template<typename _Tp, typename _Alloc>
void
vector<_Tp,_Alloc>::