diff -r 666f914201fb -r 2fe1408b6811 epoc32/include/stdapis/stlport/stl/debug/_vector.h
--- a/epoc32/include/stdapis/stlport/stl/debug/_vector.h	Tue Nov 24 13:55:44 2009 +0000
+++ b/epoc32/include/stdapis/stlport/stl/debug/_vector.h	Tue Mar 16 16:12:26 2010 +0000
@@ -1,1 +1,300 @@
-_vector.h
+/*
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Copyright (c) 1996,1997
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Copyright (c) 1997
+ * Moscow Center for SPARC Technology
+ *
+ * Copyright (c) 1999 
+ * Boris Fomitchev
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+ */
+
+/* NOTE: This is an internal header file, included by other STL headers.
+ *   You should not attempt to use it directly.
+ */
+
+#ifndef _STLP_INTERNAL_DBG_VECTOR_H
+#define _STLP_INTERNAL_DBG_VECTOR_H
+
+#include <stl/debug/_iterator.h>
+
+# ifndef _STLP_USE_WRAPPER_FOR_ALLOC_PARAM
+#  undef  _DBG_vector
+#  define _DBG_vector vector
+# endif
+
+#  define _STLP_DBG_VECTOR_BASE __WORKAROUND_DBG_RENAME(vector) <_Tp, _Alloc>
+
+_STLP_BEGIN_NAMESPACE
+
+# ifdef _STLP_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
+template <class _Tp, class _Alloc>
+inline _Tp*
+value_type(const  _DBG_iter_base< _STLP_DBG_VECTOR_BASE >&) {
+  return (_Tp*)0;
+}
+template <class _Tp, class _Alloc>
+inline random_access_iterator_tag
+iterator_category(const  _DBG_iter_base< _STLP_DBG_VECTOR_BASE >&) {
+  return random_access_iterator_tag();
+}
+# endif
+
+template <class _Tp, class _NcIt>
+struct _Vector_nonconst_traits
+{
+	typedef _Nonconst_traits<_Tp> _BaseT;
+	typedef _Tp value_type;
+	typedef _Tp& reference;
+	typedef _Tp* pointer;
+	typedef _Vector_nonconst_traits<_Tp, _NcIt> _Non_const_traits;
+};
+
+template <class _Tp, class _NcIt>
+struct _Vector_const_traits
+{
+	typedef _Const_traits<_Tp> _BaseT;
+	typedef _Tp value_type;
+	typedef const _Tp& reference;
+	typedef const _Tp* pointer;
+	typedef _Vector_nonconst_traits<_Tp, _NcIt> _Non_const_traits;
+};
+
+_STLP_TEMPLATE_NULL
+struct _Vector_nonconst_traits<bool, _Bit_iterator>
+{
+	typedef _Bit_iterator::value_type value_type;
+	typedef _Bit_iterator::reference reference;
+	typedef _Bit_iterator::pointer pointer;
+	typedef _Vector_nonconst_traits<bool, _Bit_iterator> _Non_const_traits;
+};
+
+_STLP_TEMPLATE_NULL
+struct _Vector_const_traits<bool, _Bit_iterator>
+{
+	typedef _Bit_const_iterator::value_type value_type;
+	typedef _Bit_const_iterator::reference reference;
+	typedef _Bit_const_iterator::pointer pointer;
+	typedef _Vector_nonconst_traits<bool, _Bit_iterator> _Non_const_traits;
+};
+
+template <class _Tp, _STLP_DBG_ALLOCATOR_SELECT(_Tp) >
+class _DBG_vector : public  _STLP_DBG_VECTOR_BASE {
+private:
+  typedef _STLP_DBG_VECTOR_BASE _Base;
+  typedef _DBG_vector<_Tp, _Alloc> _Self;
+  mutable __owned_list _M_iter_list;
+
+public:
+
+  __IMPORT_CONTAINER_TYPEDEFS(_Base)
+
+  typedef _DBG_iter<_Base,
+      _Vector_nonconst_traits<value_type, typename _Base::iterator> > iterator;
+    
+  typedef _DBG_iter<_Base,
+      _Vector_const_traits<value_type, typename _Base::iterator> > const_iterator;
+
+  _STLP_DECLARE_RANDOM_ACCESS_REVERSE_ITERATORS;
+
+  iterator begin() { return iterator(&_M_iter_list, this->_M_start); }
+  const_iterator begin() const { return const_iterator(&_M_iter_list, this->_M_start); }
+  iterator end() { return iterator(&_M_iter_list, this->_M_finish); }
+  const_iterator end() const { return const_iterator(&_M_iter_list, this->_M_finish); }
+
+  reverse_iterator rbegin()
+    { return reverse_iterator(end()); }
+  const_reverse_iterator rbegin() const
+    { return const_reverse_iterator(end()); }
+  reverse_iterator rend()
+    { return reverse_iterator(begin()); }
+  const_reverse_iterator rend() const
+    { return const_reverse_iterator(begin()); }
+
+  reference operator[](size_type __n) {
+    _STLP_VERBOSE_ASSERT(__n < _Base::size(), _StlMsg_OUT_OF_BOUNDS)
+    return _Base::operator[](__n);
+  }
+
+  const_reference operator[](size_type __n) const {
+    _STLP_VERBOSE_ASSERT(__n < _Base::size(), _StlMsg_OUT_OF_BOUNDS)
+    return _Base::operator[](__n);
+  }
+
+  _Base* _Get_base() { return (_Base*)this; }
+  const _Base* _Get_base() const { return (const _Base*)this; }
+
+  explicit _DBG_vector(const allocator_type& __a = allocator_type())
+    : _STLP_DBG_VECTOR_BASE(__a), _M_iter_list((const _Base*)this)  {}
+
+  _DBG_vector(size_type __n, const _Tp& __value,
+         const allocator_type& __a = allocator_type()) 
+    : _STLP_DBG_VECTOR_BASE(__n, __value, __a), _M_iter_list((const _Base*)this) {}
+
+  explicit _DBG_vector(size_type __n)
+    : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
+
+
+  _DBG_vector(const _Self& __x) 
+    : _STLP_DBG_VECTOR_BASE(__x), _M_iter_list((const _Base*)this) {}
+
+#if defined (_STLP_MEMBER_TEMPLATES)
+# ifdef _STLP_NEEDS_EXTRA_TEMPLATE_CONSTRUCTORS
+  template <class _InputIterator>
+  _DBG_vector(_InputIterator __first, _InputIterator __last):
+    _STLP_DBG_VECTOR_BASE(__first, __last), _M_iter_list((const _Base*)this) {}
+# endif
+  template <class _InputIterator>
+  _DBG_vector(_InputIterator __first, _InputIterator __last,
+         const allocator_type& __a _STLP_ALLOCATOR_TYPE_DFL) :
+    _STLP_DBG_VECTOR_BASE(__first, __last, __a), _M_iter_list((const _Base*)this) {}
+
+#else
+  _DBG_vector(const _Tp* __first, const _Tp* __last,
+         const allocator_type& __a = allocator_type())
+    : _STLP_DBG_VECTOR_BASE(__first, __last, __a), _M_iter_list((const _Base*)this) {}
+
+  // mysterious VC++ bug ?
+  _DBG_vector(const_iterator __first, const_iterator __last , 
+	      const allocator_type& __a = allocator_type())
+    : _STLP_DBG_VECTOR_BASE(__first._M_iterator, __last._M_iterator, __a),
+      _M_iter_list((const _Base*)this) { }
+
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  _Self& operator=(const _Self& __x) {
+    _M_iter_list._Invalidate_all();
+    (_Base&)*this = (const _Base&)__x;
+    return *this;
+  }
+
+  reference front() { return *begin(); }
+  const_reference front() const { return *begin(); }
+
+  reference back() {
+    iterator __tmp = end();
+    --__tmp;
+    return *__tmp;
+  }
+  const_reference back() const {
+    const_iterator __tmp = end();
+    --__tmp;
+    return *__tmp;
+  }
+
+  void swap(_Self& __x) {
+    _M_iter_list._Swap_owners(__x._M_iter_list);
+    _Base::swap((_Base&)__x);
+  }
+
+  iterator insert(iterator __position, const _Tp& __x) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    if (this->size()+1 > this->capacity()) _M_iter_list._Invalidate_all();  
+    return iterator(&_M_iter_list, _Base::insert(__position._M_iterator, __x));
+  }
+
+  iterator insert(iterator __position) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    if (this->size()+1 > this->capacity()) _M_iter_list._Invalidate_all();  
+    return iterator(&_M_iter_list, _Base::insert(__position._M_iterator));    
+  }
+
+#ifdef _STLP_MEMBER_TEMPLATES
+  // Check whether it's an integral type.  If so, it's not an iterator.
+  template <class _InputIterator>
+  void insert(iterator __position, _InputIterator __first, _InputIterator __last) {
+    _STLP_DEBUG_CHECK(__check_range(__first,__last))
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    size_type __n = distance(__first, __last);
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator, __first, __last);    
+  }
+#else /* _STLP_MEMBER_TEMPLATES */
+  void insert(iterator __position,
+              const_iterator __first, const_iterator __last) {
+    _STLP_DEBUG_CHECK(__check_range(__first,__last))
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    size_type __n = distance(__first, __last);
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator,
+		  __first._M_iterator, __last._M_iterator);        
+  }
+
+  void insert (iterator __position, const_pointer __first, const_pointer __last) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    _STLP_DEBUG_CHECK(__check_range(__first,__last))
+    size_type __n = distance(__first, __last);
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator, __first, __last);  
+}
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  void insert (iterator __position, size_type __n, const _Tp& __x){
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    if (this->size()+__n > this->capacity()) _M_iter_list._Invalidate_all();  
+    _Base::insert(__position._M_iterator, __n, __x);
+  }
+  
+  void pop_back() {
+    _STLP_VERBOSE_ASSERT(!this->empty(), _StlMsg_EMPTY_CONTAINER)
+    __invalidate_iterator(&_M_iter_list,end());
+    _Base::pop_back();
+  }
+  iterator erase(iterator __position) {
+    _STLP_DEBUG_CHECK(__check_if_owner(&_M_iter_list, __position))
+    _STLP_VERBOSE_ASSERT(__position._M_iterator !=this->_M_finish,_StlMsg_ERASE_PAST_THE_END)
+    __invalidate_range(&_M_iter_list, __position+1, end());
+    return iterator(&_M_iter_list,_Base::erase(__position._M_iterator));
+  }
+  iterator erase(iterator __first, iterator __last) {
+    _STLP_DEBUG_CHECK(__check_range(__first,__last, begin(), end()))
+    __invalidate_range(&_M_iter_list, __first._M_iterator == this->_M_finish ? 
+		       __first : __first+1, end());
+    return iterator(&_M_iter_list, _Base::erase(__first._M_iterator, __last._M_iterator));
+  }
+  void clear() { 
+    _M_iter_list._Invalidate_all();
+    _Base::clear();
+  }
+  void push_back(const _Tp& __x) {
+    if (this->size()+1 > this->capacity()) _M_iter_list._Invalidate_all();
+    _Base::push_back(__x);
+  }
+};
+
+#define _STLP_TEMPLATE_HEADER template <class _Tp, class _Alloc>
+#define _STLP_TEMPLATE_CONTAINER _DBG_vector<_Tp, _Alloc>
+#define _STLP_TEMPLATE_CONTAINER_BASE _STLP_DBG_VECTOR_BASE
+#include <stl/debug/_relops_cont.h>
+#undef _STLP_TEMPLATE_CONTAINER_BASE
+#undef _STLP_TEMPLATE_CONTAINER
+#undef _STLP_TEMPLATE_HEADER
+
+# if defined (_STLP_USE_TEMPLATE_EXPORT) 
+ _STLP_EXPORT_TEMPLATE_CLASS _DBG_vector <void*,allocator<void*> >;
+#  endif /* _STLP_USE_TEMPLATE_EXPORT */
+
+_STLP_END_NAMESPACE
+
+# undef _STLP_DBG_VECTOR_BASE
+# undef _DBG_vector
+
+#endif /* _STLP_DBG_VECTOR_H */
+
+// Local Variables:
+// mode:C++
+// End: