Ticket #13015: shadowed_members.patch

MAIN/Third_Party_Libraries/Boost/include/boost/random/shuffle_order.hpp

@@ -200 +200 @@
     }
 
     /** Returns true if the two generators will produce identical sequences. */
-    BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(shuffle_order_engine, x, y)
-    { return x._rng == y._rng && x.y == y.y && std::equal(x.v, x.v+k, y.v); }
+    BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(shuffle_order_engine, _x, _y)
+    { return _x._rng == _y._rng && _x.y == _y.y && std::equal(_x.v, _x.v+k, _y.v); }
     /** Returns true if the two generators will produce different sequences. */
     BOOST_RANDOM_DETAIL_INEQUALITY_OPERATOR(shuffle_order_engine)
 

MAIN/Third_Party_Libraries/Boost/include/boost/random/subtract_with_carry.hpp

@@ -244 +244 @@
      * Returns true if the two generators will produce identical
      * sequences of values.
      */
-    BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(subtract_with_carry_engine, x, y)
+    BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(subtract_with_carry_engine, _x, _y)
     {
         for(unsigned int j = 0; j < r; ++j)
-            if(x.compute(j) != y.compute(j))
+            if(_x.compute(j) != _y.compute(j))
                 return false;
         return true;
     }
@@ -268 +268 @@
 
     friend struct detail::subtract_with_carry_discard;
 
-    IntType do_update(std::size_t current, std::size_t short_index, IntType carry)
+    IntType do_update(std::size_t current, std::size_t short_index, IntType _carry)
     {
         IntType delta;
-        IntType temp = x[current] + carry;
+        IntType temp = x[current] + _carry;
         if (x[short_index] >= temp) {
             // x(n) >= 0
             delta =  x[short_index] - temp;
-            carry = 0;
+            _carry = 0;
         } else {
             // x(n) < 0
             delta = modulus - temp + x[short_index];
-            carry = 1;
+            _carry = 1;
         }
         x[current] = delta;
-        return carry;
+        return _carry;
     }
     /// \endcond
 
@@ -478 +478 @@
     }
 
     /** Returns true if the two generators will produce identical sequences. */
-    BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(subtract_with_carry_01_engine, x, y)
+    BOOST_RANDOM_DETAIL_EQUALITY_OPERATOR(subtract_with_carry_01_engine, _x, _y)
     {
         for(unsigned int j = 0; j < r; ++j)
-            if(x.compute(j) != y.compute(j))
+            if(_x.compute(j) != _y.compute(j))
                 return false;
         return true;
     }
@@ -498 +498 @@
 
     friend struct detail::subtract_with_carry_discard;
 
-    RealType do_update(std::size_t current, std::size_t short_index, RealType carry)
+    RealType do_update(std::size_t current, std::size_t short_index, RealType _carry)
     {
-        RealType delta = x[short_index] - x[current] - carry;
+        RealType delta = x[short_index] - x[current] - _carry;
         if(delta < 0) {
             delta += RealType(1);
-            carry = RealType(1)/_modulus;
+            _carry = RealType(1)/_modulus;
         } else {
-            carry = 0;
+            _carry = 0;
         }
         x[current] = delta;
-        return carry;
+        return _carry;
     }
     /// \endcond
     std::size_t k;