Bump for 4.0-15
[LibreOffice.git] / boost / boost.7774.warnings.patch.1
blob60c4f05e2087ac538f9b2a1a839ff65de294ac24
1 diff -ur boost.org/boost/random/binomial_distribution.hpp boost/boost/random/binomial_distribution.hpp
2 --- boost.org/boost/random/binomial_distribution.hpp    2012-12-07 21:17:45.789067382 +0100
3 +++ boost/boost/random/binomial_distribution.hpp        2012-12-07 21:42:39.915034045 +0100
4 @@ -42,12 +42,12 @@
5     *
6     * Requires: t >=0 && 0 <= p <= 1
7     */
8 -  explicit binomial_distribution(IntType t = 1,
9 -                                 const RealType& p = RealType(0.5))
10 -    : _bernoulli(p), _t(t)
11 +  explicit binomial_distribution(IntType t_arg = 1,
12 +                                 const RealType& p_arg = RealType(0.5))
13 +    : _bernoulli(p_arg), _t(t_arg)
14    {
15      assert(_t >= 0);
16 -    assert(RealType(0) <= p && p <= RealType(1));
17 +    assert(RealType(0) <= p_arg && p_arg <= RealType(1));
18    }
20    // compiler-generated copy ctor and assignment operator are fine
21 diff -ur boost.org/boost/random/geometric_distribution.hpp boost/boost/random/geometric_distribution.hpp
22 --- boost.org/boost/random/geometric_distribution.hpp   2012-12-07 21:17:45.789067382 +0100
23 +++ boost/boost/random/geometric_distribution.hpp       2012-12-07 21:41:34.970035494 +0100
24 @@ -50,8 +50,8 @@
25     *
26     * Requires: 0 < p < 1
27     */
28 -  explicit geometric_distribution(const RealType& p = RealType(0.5))
29 -    : _p(p)
30 +  explicit geometric_distribution(const RealType& p_arg = RealType(0.5))
31 +    : _p(p_arg)
32    {
33      assert(RealType(0) < _p && _p < RealType(1));
34      init();