stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r694675 - /stdcxx/branches/4.2.x/include/rw/_specialized.h
Date Fri, 12 Sep 2008 10:45:39 GMT
Author: faridz
Date: Fri Sep 12 03:45:39 2008
New Revision: 694675

URL: http://svn.apache.org/viewvc?rev=694675&view=rev
Log:
2008-09-12  Farid Zaripov  <faridz@apache.org>

	STDCXX-976
	* include/rw/_specialized.h (uninitialized_copy): Reverted r687762.
	Added const _TypeU& overloads of the __rw_construct().

Modified:
    stdcxx/branches/4.2.x/include/rw/_specialized.h

Modified: stdcxx/branches/4.2.x/include/rw/_specialized.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_specialized.h?rev=694675&r1=694674&r2=694675&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_specialized.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_specialized.h Fri Sep 12 03:45:39 2008
@@ -52,11 +52,6 @@
 #endif   // _RWSTD_RW_NEW_H_INCLUDED
 
 
-#ifndef _RWSTD_RW_ITERBASE_H_INCLUDED
-#  include <rw/_iterbase.h>
-#endif   // _RWSTD_RW_ITERBASE_H_INCLUDED
-
-
 _RWSTD_NAMESPACE (__rw) { 
 
 
@@ -98,12 +93,29 @@
 
 template <class _TypeT, class _TypeU>
 inline void
+__rw_construct (_TypeT* __p, const _TypeU& __val)
+{
+    ::new (_RWSTD_STATIC_CAST (void*, __p)) _TypeT (__val);
+}
+
+
+template <class _TypeT, class _TypeU>
+inline void
 __rw_construct (volatile _TypeT* __p, _TypeU& __val)
 {
     // remove volatile before invoking operator new
     __rw_construct (_RWSTD_CONST_CAST (_TypeT*, __p), __val);
 }
 
+
+template <class _TypeT, class _TypeU>
+inline void
+__rw_construct (volatile _TypeT* __p, const _TypeU& __val)
+{
+    // remove volatile before invoking operator new
+    __rw_construct (_RWSTD_CONST_CAST (_TypeT*, __p), __val);
+}
+
 #else   // #ifdef _RWSTD_NO_PART_SPEC_OVERLOAD
 
 template <class _TypeT, class _TypeU>
@@ -167,16 +179,10 @@
                     _ForwardIterator __res)
 {
     const _ForwardIterator __start = __res;
-    typedef const _TYPENAME iterator_traits<_InputIterator>::value_type& _RefT;
 
     _TRY {
         for (; __first != __last; ++__first, ++__res)
-#ifndef __HP_aCC
-            _RW::__rw_construct (&*__res, _RefT (*__first));
-#else    // ifdef __HP_aCC
-            // Don't cast to _RefT on HP aCC due to ICE (see STDCXX-1005)
             _RW::__rw_construct (&*__res, *__first);
-#endif   // __HP_aCC
     }
     _CATCH (...) {
         _RW::__rw_destroy (__start, __res);



Mime
View raw message