diff options
| author | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-23 11:24:46 +0000 |
|---|---|---|
| committer | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-23 11:24:46 +0000 |
| commit | f2296c4b52a6c13fe3feba249aa468ec030bf98e (patch) | |
| tree | 35ff0838ef925ec0dfac69240da418b0c303c618 /libstdc++-v3/include/ext/random.tcc | |
| parent | 10281157f89a54bb9712a3aa4a13b61d97ebf51b (diff) | |
| download | gcc-f2296c4b52a6c13fe3feba249aa468ec030bf98e.tar.gz | |
PR libstdc++/54675
* include/ext/random: Avoid the badname __alpha (and, for
consistency, __mu, __nu, __sigma and __omega too).
* include/bits/random.tcc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@191650 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext/random.tcc')
| -rw-r--r-- | libstdc++-v3/include/ext/random.tcc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libstdc++-v3/include/ext/random.tcc b/libstdc++-v3/include/ext/random.tcc index 18d2a18805f..137b6588dc9 100644 --- a/libstdc++-v3/include/ext/random.tcc +++ b/libstdc++-v3/include/ext/random.tcc @@ -773,12 +773,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const typename __ios_base::fmtflags __flags = __is.flags(); __is.flags(__ios_base::dec | __ios_base::skipws); - _RealType __nu, __sigma; - __is >> __nu >> __sigma; + _RealType __nu_val, __sigma_val; + __is >> __nu_val >> __sigma_val; __is >> __x._M_ndx; __is >> __x._M_ndy; __x.param(typename rice_distribution<_RealType>:: - param_type(__nu, __sigma)); + param_type(__nu_val, __sigma_val)); __is.flags(__flags); return __is; @@ -838,11 +838,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const typename __ios_base::fmtflags __flags = __is.flags(); __is.flags(__ios_base::dec | __ios_base::skipws); - _RealType __mu, __omega; - __is >> __mu >> __omega; + _RealType __mu_val, __omega_val; + __is >> __mu_val >> __omega_val; __is >> __x._M_gd; __x.param(typename nakagami_distribution<_RealType>:: - param_type(__mu, __omega)); + param_type(__mu_val, __omega_val)); __is.flags(__flags); return __is; @@ -860,10 +860,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>) - result_type __mu = __p.mu(); + result_type __mu_val = __p.mu(); result_type __malphinv = -result_type(1) / __p.alpha(); while (__f != __t) - *__f++ = __mu * std::pow(this->_M_ud(__urng), __malphinv); + *__f++ = __mu_val * std::pow(this->_M_ud(__urng), __malphinv); } template<typename _RealType, typename _CharT, typename _Traits> @@ -902,11 +902,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const typename __ios_base::fmtflags __flags = __is.flags(); __is.flags(__ios_base::dec | __ios_base::skipws); - _RealType __alpha, __mu; - __is >> __alpha >> __mu; + _RealType __alpha_val, __mu_val; + __is >> __alpha_val >> __mu_val; __is >> __x._M_ud; __x.param(typename pareto_distribution<_RealType>:: - param_type(__alpha, __mu)); + param_type(__alpha_val, __mu_val)); __is.flags(__flags); return __is; |