diff -r 666f914201fb -r 2fe1408b6811 epoc32/include/stdapis/stlport/stl/_auto_ptr.h
--- a/epoc32/include/stdapis/stlport/stl/_auto_ptr.h	Tue Nov 24 13:55:44 2009 +0000
+++ b/epoc32/include/stdapis/stlport/stl/_auto_ptr.h	Tue Mar 16 16:12:26 2010 +0000
@@ -1,1 +1,175 @@
-_auto_ptr.h
+/*
+ * © Portions copyright (c) 2006-2007 Nokia Corporation.  All rights reserved.
+ * Copyright (c) 1997-1999
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * 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.
+ *
+ */
+
+#ifndef _STLP_AUTO_PTR_H
+# define _STLP_AUTO_PTR_H
+
+_STLP_BEGIN_NAMESPACE
+// implementation primitive
+class __ptr_base {
+public:
+  void* _M_p;
+  void  __set(const void* __p) { _M_p = __CONST_CAST(void*,__p); }
+  void  __set(void* __p) { _M_p = __p; }
+};
+
+template <class _Tp> class auto_ptr_ref {
+public:
+  __ptr_base& _M_r;
+  _Tp* const _M_p;
+
+  auto_ptr_ref(__ptr_base& __r, _Tp* __p) : _M_r(__r), _M_p(__p) {  }
+
+  _Tp* release() const { _M_r.__set((void*)0); return _M_p; }
+
+};
+
+template<class _Tp> class auto_ptr :  public __ptr_base {
+public:
+  typedef _Tp element_type;
+  typedef auto_ptr<_Tp>           _Self;
+
+  _Tp* release() {
+    _Tp* __px = this->get();
+    this->_M_p = 0;
+    return __px;
+  }
+
+  void reset(_Tp* __px=0) {
+    _Tp* __pt = this->get();
+    if (__px != __pt)
+      delete __pt;
+    this->__set(__px);
+  }
+
+  _Tp* get() const { return __REINTERPRET_CAST(_Tp*,__CONST_CAST(void*,_M_p)); }
+
+# if !defined (_STLP_NO_ARROW_OPERATOR)
+  _Tp* operator->() const {
+    _STLP_VERBOSE_ASSERT(get()!=0, _StlMsg_AUTO_PTR_NULL)
+    return get();
+  }
+# endif
+  _Tp& operator*() const  {
+    _STLP_VERBOSE_ASSERT(get()!=0, _StlMsg_AUTO_PTR_NULL)
+    return *get();
+  }
+
+  auto_ptr() {
+    this->_M_p = 0;
+# ifdef _STLP_USE_TRAP_LEAVE
+    CleanupStack::PushL(TCleanupItem(Close, (void*)this));
+# endif
+  }
+
+  explicit auto_ptr(_Tp* __px) {
+    this->__set(__px);
+# ifdef _STLP_USE_TRAP_LEAVE
+    CleanupStack::PushL(TCleanupItem(Close, (void*)this));
+# endif
+  }
+
+#if defined (_STLP_MEMBER_TEMPLATES)
+# if !defined (_STLP_NO_TEMPLATE_CONVERSIONS)
+  template<class _Tp1> auto_ptr(auto_ptr<_Tp1>& __r) {
+    _Tp* __conversionCheck = __r.release();
+    this->__set(__conversionCheck);
+# ifdef _STLP_USE_TRAP_LEAVE
+    CleanupStack::PushL(TCleanupItem(Close, (void*)this));
+# endif
+  }
+# endif
+  template<class _Tp1> auto_ptr<_Tp>& operator=(auto_ptr<_Tp1>& __r) {
+    _Tp* __conversionCheck = __r.release();
+    reset(__conversionCheck);
+    return *this;
+  }
+#endif /* _STLP_MEMBER_TEMPLATES */
+
+  auto_ptr(_Self& __r)
+  { this->__set(__r.release());
+# ifdef _STLP_USE_TRAP_LEAVE
+    CleanupStack::PushL(TCleanupItem(Close, (void*)this));
+# endif
+  }
+
+  _Self& operator=(_Self& __r)  {
+    reset(__r.release());
+    return *this;
+  }
+
+  ~auto_ptr() { _STLP_POP_ITEM reset(0); }
+
+  auto_ptr(auto_ptr_ref<_Tp> __r) {
+    this->__set(__r.release());
+# ifdef _STLP_USE_TRAP_LEAVE
+    CleanupStack::PushL(TCleanupItem(Close, (void*)this));
+# endif
+  }
+
+  _Self& operator=(auto_ptr_ref<_Tp> __r) {
+    reset(__r.release());
+    return *this;
+  }
+
+
+  _Self& operator=(_Tp* __px) {
+  	reset(__px);
+    return *this;
+  }
+
+
+
+# if defined(_STLP_MEMBER_TEMPLATES) && !defined(_STLP_NO_TEMPLATE_CONVERSIONS)
+  template<class _Tp1> operator auto_ptr_ref<_Tp1>() {
+    return auto_ptr_ref<_Tp1>(*this, this->get());
+  }
+  template<class _Tp1> operator auto_ptr<_Tp1>() {
+    return auto_ptr<_Tp1>(release());
+  }
+# else
+  operator auto_ptr_ref<_Tp>()
+  { return auto_ptr_ref<_Tp>(*this, this->get()); }
+# endif
+
+# ifdef _STLP_USE_TRAP_LEAVE
+  static void Close(void* aPtr);
+# endif
+
+};
+
+# ifdef _STLP_USE_TRAP_LEAVE
+template <class _Tp>
+void
+auto_ptr<_Tp>::Close(void* aPtr)
+{
+  auto_ptr<_Tp>* self = (auto_ptr<_Tp>*)aPtr;
+  self->reset(0);
+}
+# endif
+
+
+_STLP_END_NAMESPACE
+
+#endif /* _STLP_AUTO_PTR_H */
+
+// Local Variables:
+// mode:C++
+// End:
+