diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-07 22:01:03 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-07 22:04:15 +0100 |
| commit | 632cdffd08df8cdaeba47c6c42c7f718aaf9e751 (patch) | |
| tree | fa32ab44dd301ccf909f5428b29e4eb64231e9ed /boost | |
| parent | 74471fbf16bb8a132025c280b2bf0535aa202ef9 (diff) | |
fix Wshadow warnings in boost random
upstreamed as https://svn.boost.org/trac/boost/ticket/7774
Change-Id: I73d25ff16733a0b5c61250fdd98bee13b9fb7173
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 2 | ||||
| -rw-r--r-- | boost/boost.7774.warnings.patch.1 | 34 |
2 files changed, 36 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 8035da2c03d9..4db9aef35f0e 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -30,6 +30,8 @@ boost_patches += boost.4100.warnings.patch boost_patches += boost.4510.warnings.patch #https://svn.boost.org/trac/boost/ticket/6940 boost_patches += boost.6940.glibc.patch +#https://svn.boost.org/trac/boost/ticket/7774 +boost_patches += boost.7774.warnings.patch.1 boost_patches += boost.windows.patch boost_patches += boost.vc2012.patch diff --git a/boost/boost.7774.warnings.patch.1 b/boost/boost.7774.warnings.patch.1 new file mode 100644 index 000000000000..60c4f05e2087 --- /dev/null +++ b/boost/boost.7774.warnings.patch.1 @@ -0,0 +1,34 @@ +diff -ur boost.org/boost/random/binomial_distribution.hpp boost/boost/random/binomial_distribution.hpp +--- boost.org/boost/random/binomial_distribution.hpp 2012-12-07 21:17:45.789067382 +0100 ++++ boost/boost/random/binomial_distribution.hpp 2012-12-07 21:42:39.915034045 +0100 +@@ -42,12 +42,12 @@ + * + * Requires: t >=0 && 0 <= p <= 1 + */ +- explicit binomial_distribution(IntType t = 1, +- const RealType& p = RealType(0.5)) +- : _bernoulli(p), _t(t) ++ explicit binomial_distribution(IntType t_arg = 1, ++ const RealType& p_arg = RealType(0.5)) ++ : _bernoulli(p_arg), _t(t_arg) + { + assert(_t >= 0); +- assert(RealType(0) <= p && p <= RealType(1)); ++ assert(RealType(0) <= p_arg && p_arg <= RealType(1)); + } + + // compiler-generated copy ctor and assignment operator are fine +diff -ur boost.org/boost/random/geometric_distribution.hpp boost/boost/random/geometric_distribution.hpp +--- boost.org/boost/random/geometric_distribution.hpp 2012-12-07 21:17:45.789067382 +0100 ++++ boost/boost/random/geometric_distribution.hpp 2012-12-07 21:41:34.970035494 +0100 +@@ -50,8 +50,8 @@ + * + * Requires: 0 < p < 1 + */ +- explicit geometric_distribution(const RealType& p = RealType(0.5)) +- : _p(p) ++ explicit geometric_distribution(const RealType& p_arg = RealType(0.5)) ++ : _p(p_arg) + { + assert(RealType(0) < _p && _p < RealType(1)); + init(); |