svn commit: r814401 - /stdcxx/branches/4.2.x/include/valarray

[sebor]

Author: sebor
Date: Sun Sep 13 22:25:08 2009
New Revision: 814401

URL: http://svn.apache.org/viewvc?rev=814401&view=rev
Log:
2009-09-13  Martin Sebor  <se...@apache.org>

        STDCXX-791
        * include/valarray (valarray::valarray(const gslice_array&,
        gslice_array::operator=, gslice_array::operator*=,
        gslice_array::operator/=, gslice_array::operator+=,
        gslice_array::operator-=, gslice_array::operator%=,
        gslice_array::operator^=, gslice_array::operator&=,
        gslice_array::operator|=, gslice_array::operator<<=,
        gslice_array::operator>>=): Parenthesized logic expression
        to silence gcc -Wparentheses warning. (Missed in r814400).

Modified:
    stdcxx/branches/4.2.x/include/valarray

Modified: stdcxx/branches/4.2.x/include/valarray
URL: 
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/valarray?rev=814401&r1=814400&r2=814401&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/valarray (original)
+++ stdcxx/branches/4.2.x/include/valarray Sun Sep 13 22:25:08 2009
@@ -1856,8 +1856,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] = __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1871,8 +1871,7 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( !gsl->is_reseted() || !__cpt && gsl->ind_numb() )
-    {
+    while (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ())) {
       (*_C_array)[__i] = value;
       __i= gsl->next_ind();
       __cpt++;
@@ -1889,8 +1888,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] *= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1904,8 +1903,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] /= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1919,8 +1918,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (  (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] += __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1934,8 +1933,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted() || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] -= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1950,8 +1949,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] %= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1965,8 +1964,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] ^= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1980,8 +1979,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted() || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] &= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -1995,8 +1994,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted() || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] |= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -2010,8 +2009,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] <<= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -2025,8 +2024,8 @@
     _RWSTD_SIZE_T __i = gsl->next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( (!gsl->is_reseted() || !__cpt && gsl->ind_numb()) && __cpt < 
__rhs.size() )
-    {
+    while (   (!gsl->is_reseted () || (!__cpt && gsl->ind_numb ()))
+           && __cpt < __rhs.size ()) {
       (*_C_array)[__i] >>= __rhs[__cpt];
       __i= gsl->next_ind();
       __cpt++;
@@ -2158,8 +2157,7 @@
     _RWSTD_SIZE_T __i = __sl.next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( !__sl.is_reseted() || !__cpt && __maxinx )
-    {
+    while (!__sl.is_reseted () || (!__cpt && __maxinx)) {
       __tmp[__cpt] = (*(sl_ar.get_ref_mem_array()))[__i];
       __i= __sl.next_ind();
       __cpt++;