diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-07-11 22:08:56 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-07-11 22:08:56 +0000 |
| commit | ad084e9d07b907cfe52961a1d43155d24626c415 (patch) | |
| tree | 9ad0213e554e45ee126dbbabb3fd5a203ff2acd5 /libstdc++-v3 | |
| parent | 6ab639421e3f592ccd831ee592c049bf95be8467 (diff) | |
| download | gcc-ad084e9d07b907cfe52961a1d43155d24626c415.zip gcc-ad084e9d07b907cfe52961a1d43155d24626c415.tar.gz gcc-ad084e9d07b907cfe52961a1d43155d24626c415.tar.bz2 | |
re PR libstdc++/28344 (Use of __alpha in tr1/random breaks Tru64 UNIX bootstrap)
2006-07-11 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/28344
* include/tr1/random (gamma_distribution<>::
gamma_distribution(const result_type&)): Don't use __alpha as
parameter name, a predefined macro on Alpha systems.
From-SVN: r115355
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/random | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 85b0506..6f143dc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2006-07-11 Paolo Carlini <pcarlini@suse.de> + PR libstdc++/28344 + * include/tr1/random (gamma_distribution<>:: + gamma_distribution(const result_type&)): Don't use __alpha as + parameter name, a predefined macro on Alpha systems. + +2006-07-11 Paolo Carlini <pcarlini@suse.de> + PR libstdc++/28290 * include/ext/codecvt_specializations.h: Fix, adding missing includes and guards. diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random index 897d871..f90c8d1 100644 --- a/libstdc++-v3/include/tr1/random +++ b/libstdc++-v3/include/tr1/random @@ -1980,8 +1980,8 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) * Constructs a gamma distribution with parameters @f$ \alpha @f$. */ explicit - gamma_distribution(const result_type& __alpha = result_type(1)) - : _M_alpha(__alpha) + gamma_distribution(const result_type& __alpha_val = result_type(1)) + : _M_alpha(__alpha_val) { _GLIBCXX_DEBUG_ASSERT(_M_alpha > 0); } |