Author: sebor
Date: Tue Jul 24 20:24:17 2007
New Revision: 559300

URL: http://svn.apache.org/viewvc?view=rev&rev=559300
Log:
2007-07-24  Travis Vitek  <vitek@roguewave.com>

	STDCXX-502
	* valarray (valarray, operator=): Updated local variable names
	to meet conventions and get test 17.names passing again.

Modified:
    incubator/stdcxx/trunk/include/valarray

Modified: incubator/stdcxx/trunk/include/valarray
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/valarray?view=diff&rev=559300&r1=559299&r2=559300
==============================================================================
--- incubator/stdcxx/trunk/include/valarray (original)
+++ incubator/stdcxx/trunk/include/valarray Tue Jul 24 20:24:17 2007
@@ -2141,18 +2141,18 @@
 template <class _TypeT>
 inline valarray<_TypeT>::valarray(const gslice_array<_TypeT>& sl_ar)
 {
-    gslice sl(sl_ar._C_get_slice());
+    gslice __sl(sl_ar._C_get_slice());
 
     _RW::__rw_array <_TypeT> __tmp =
-        _RW::__rw_array <_TypeT>(_TypeT (), sl.ind_numb());
+        _RW::__rw_array <_TypeT>(_TypeT (), __sl.ind_numb());
 
-    _RWSTD_SIZE_T __i = sl.next_ind();
+    _RWSTD_SIZE_T __i = __sl.next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( !sl.is_reseted() )
+    while( !__sl.is_reseted() )
     {
       __tmp[__cpt] = (*(sl_ar.get_ref_mem_array()))[__i];
-      __i= sl.next_ind();
+      __i= __sl.next_ind();
       __cpt++;
     }
 
@@ -2164,18 +2164,18 @@
 inline valarray<_TypeT>&
 valarray<_TypeT>::operator= (const gslice_array<_TypeT>& sl_ar)
 { 
-    gslice sl(sl_ar._C_get_slice());
+    gslice __sl(sl_ar._C_get_slice());
 
     _RW::__rw_array <_TypeT> __tmp =
-        _RW::__rw_array <_TypeT>(_TypeT (), sl.ind_numb());
+        _RW::__rw_array <_TypeT>(_TypeT (), __sl.ind_numb());
 
-    _RWSTD_SIZE_T __i = sl.next_ind();
+    _RWSTD_SIZE_T __i = __sl.next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( !sl.is_reseted() )
+    while( !__sl.is_reseted() )
     {
       __tmp[__cpt] = (*(sl_ar.get_ref_mem_array()))[__i];
-      __i= sl.next_ind();
+      __i= __sl.next_ind();
       __cpt++;
     }
 
@@ -2212,20 +2212,20 @@
 inline valarray<_TypeT>::valarray(const mask_array<_TypeT>& __rhs)
 {
 
-    mask_array<_TypeT>  *msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
-    const valarray<bool>*sec = msk->_C_get_array_ptr();
+    mask_array<_TypeT>  *__msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
+    const valarray<bool>*__sec = __msk->_C_get_array_ptr();
 
     _RWSTD_SIZE_T __i, __n = 0;
 
-    for(__i = 0; __i < sec->size(); __i++)
-        if ( (*sec)[__i]) __n++;
+    for(__i = 0; __i < __sec->size(); __i++)
+        if ( (*__sec)[__i]) __n++;
 
     _RW::__rw_array <_TypeT> __tmp = _RW::__rw_array <_TypeT>(_TypeT (), __n);
       
     _RWSTD_SIZE_T __cpt = 0; 
 
-    for( __i=0; __i < sec->size(); __i++ )
-      if ( (*sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
+    for( __i=0; __i < __sec->size(); __i++ )
+      if ( (*__sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
 
     _C_array.swap (__tmp);
 }
@@ -2235,21 +2235,21 @@
 inline valarray<_TypeT>&
 valarray<_TypeT>::operator= (const mask_array<_TypeT>& __rhs)
 { 
-    mask_array<_TypeT>  *msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
-    const valarray<bool>*sec = msk->_C_get_array_ptr();
+    mask_array<_TypeT>  *__msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
+    const valarray<bool>*__sec = __msk->_C_get_array_ptr();
 
     _RWSTD_SIZE_T __i, __n = 0;
 
-    for (__i = 0; __i < sec->size(); __i++)
-        if ((*sec)[__i])
+    for (__i = 0; __i < __sec->size(); __i++)
+        if ((*__sec)[__i])
             __n++;
 
     _RW::__rw_array <_TypeT> __tmp = _RW::__rw_array <_TypeT>(_TypeT (), __n);
       
     _RWSTD_SIZE_T __cpt = 0; 
 
-    for( __i=0; __i < sec->size(); __i++ )
-      if ( (*sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
+    for( __i=0; __i < __sec->size(); __i++ )
+      if ( (*__sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
 
     if ( &_C_array == __rhs.get_ref_mem_array() )
       _C_array.resize(0);