stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r587164 - /incubator/stdcxx/branches/4.2.x/include/vector.cc
Date Mon, 22 Oct 2007 17:23:00 GMT
Author: faridz
Date: Mon Oct 22 10:22:59 2007
New Revision: 587164

URL: http://svn.apache.org/viewvc?rev=587164&view=rev
Log:
2007-10-22 Farid Zaripov <farid_zaripov@epam.com>

	STDCXX-495
	* vector.cc (_C_insert_1): Allow inserting the values from *this.
	If the value_type is a fundamental type, then save the inserting value
	in a temporary copy before the moving [it; end()) range toward to end.
	If the value_type is not a fundamental type, then save the pointer to
	the inserting value and adjust the pointer if the inserting value belongs
	to the range [it; end()).

Modified:
    incubator/stdcxx/branches/4.2.x/include/vector.cc

Modified: incubator/stdcxx/branches/4.2.x/include/vector.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/vector.cc?rev=587164&r1=587163&r2=587164&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/include/vector.cc (original)
+++ incubator/stdcxx/branches/4.2.x/include/vector.cc Mon Oct 22 10:22:59 2007
@@ -39,6 +39,8 @@
  * 
  **************************************************************************/
 
+#include <rw/_typetraits.h>   // for __rw_type_traits<>
+
 _RWSTD_NAMESPACE (std) { 
 
 template <class _TypeT, class _Allocator>
@@ -178,12 +180,38 @@
             // and bump up end()
             _C_push_back (*(_C_end - difference_type (1)));
 
-            // move the remaining elements from the range above one slot
-            // toward the end starting with the last element
-            _STD::copy_backward (__it, end () - 2, __end);
-
-            // overwrite the element at the given position
-            *__it = __x;
+            if (__rw::__rw_type_traits<value_type>::_C_is_class) {
+                // save the pointer to allow inserting the value from self
+                const value_type* __px = &__x;
+
+                if (&*__it < __px && __px < &*__end) {
+                    // adjust the pointer if the inserting value
+                    // belongs the range (__it; __end)
+                    ++__px;
+                } else if (&*__it == __px) {
+                    // reset the pointer to 0 to avoid
+                    // self assignment __x = __x
+                    __px = 0;
+                }
+
+                // move the remaining elements from the range above one slot
+                // toward the end starting with the last element
+                _STD::copy_backward (__it, end () - 2, __end);
+
+                // overwrite the element at the given position
+                if (__px)
+                    *__it = *__px;
+            } else {
+                // save the copy to allow inserting the value from self
+                const value_type __tmp = __x;
+
+                // move the remaining elements from the range above one slot
+                // toward the end starting with the last element
+                _STD::copy_backward (__it, end () - 2, __end);
+
+                // overwrite the element at the given position
+                *__it = __tmp;
+            }
         }
         else {
             // construct a copy of the value to be inserted



Mime
View raw message