Skip to content

R
riscv-gcc-1
Commit 5bcb3b4d by Paolo Carlini Committed by Paolo Carlini
Options

re PR libstdc++/55169 (std::discrete_distribution::operator(generator&) makes… 

re PR libstdc++/55169 (std::discrete_distribution::operator(generator&) makes unnecessary copy of parameter vector)

2012-11-02  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/55169
	* include/bits/random.h: Remove all uses of param().
	(chi_squared_distribution<>::__generate_impl(_ForwardIterator,
	_ForwardIterator, _UniformRandomNumberGenerator&): Declare
	* include/bits/random.tcc: ... define.
	* include/ext/random: Remove all uses of param().

From-SVN: r193092
parent e570b479
Showing with 51 additions and 31 deletions
libstdc++-v3/ChangeLog
2012-11-02 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/55169
* include/bits/random.h: Remove all uses of param().
(chi_squared_distribution<>::__generate_impl(_ForwardIterator,
_ForwardIterator, _UniformRandomNumberGenerator&): Declare
* include/bits/random.tcc: ... define.
* include/ext/random: Remove all uses of param().
2012-11-02 Gerald Pfeifer <gerald@pfeifer.com> 2012-11-02 Gerald Pfeifer <gerald@pfeifer.com>
* doc/xml/manual/allocator.xml: Update reference to Hoard. * doc/xml/manual/allocator.xml: Update reference to Hoard.
...@@ -27,7 +36,7 @@ ...@@ -27,7 +36,7 @@
* testsuite/23_containers/forward_list/cons/14.cc: New. * testsuite/23_containers/forward_list/cons/14.cc: New.
2012-11-02 Gerald Pfeifer <gerald@pfeifer.com> 2012-11-02 Gerald Pfeifer <gerald@pfeifer.com>
* doc/xml/manual/codecvt.xml: Fix reference to Austin Common * doc/xml/manual/codecvt.xml: Fix reference to Austin Common
Standards Revision Group. Standards Revision Group.
* doc/xml/manual/messages.xml: Ditto. * doc/xml/manual/messages.xml: Ditto.
...@@ -39,7 +48,7 @@ ...@@ -39,7 +48,7 @@
STL at SGI. STL at SGI.
Update reference to COM at Microsoft. Update reference to COM at Microsoft.
Update reference to Worst-case efficient priority queues at ACM. Update reference to Worst-case efficient priority queues at ACM.
2012-11-01 Jonathan Wakely <jwakely.gcc@gmail.com> 2012-11-01 Jonathan Wakely <jwakely.gcc@gmail.com>
* testsuite/18_support/initializer_list/range_access.cc: Fix copying * testsuite/18_support/initializer_list/range_access.cc: Fix copying
......
libstdc++-v3/include/bits/random.tcc
...@@ -2150,6 +2150,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2150,6 +2150,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __is; return __is;
} }
template<typename _RealType>
template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator>
void
std::chi_squared_distribution<_RealType>::
__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng)
{
__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
while (__f != __t)
*__f++ = 2 * _M_gd(__urng);
}
template<typename _RealType> template<typename _RealType>
template<typename _ForwardIterator, template<typename _ForwardIterator,
...@@ -2158,8 +2170,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2158,8 +2170,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
std::chi_squared_distribution<_RealType>:: std::chi_squared_distribution<_RealType>::
__generate_impl(_ForwardIterator __f, _ForwardIterator __t, __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng, _UniformRandomNumberGenerator& __urng,
typename std::gamma_distribution<result_type>::param_type& const typename
__p) std::gamma_distribution<result_type>::param_type& __p)
{ {
__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
while (__f != __t) while (__f != __t)
......
libstdc++-v3/include/ext/random
...@@ -510,7 +510,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -510,7 +510,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -540,6 +540,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -540,6 +540,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ this->__generate_impl(__f, __t, __urng, __p); } { this->__generate_impl(__f, __t, __urng, __p); }
/** /**
* @brief Return true if two beta distributions have the same
* parameters and the sequences that would be generated
* are equal.
*/
friend bool
operator==(const beta_distribution& __d1,
const beta_distribution& __d2)
{ return __d1._M_param == __d2._M_param; }
/**
* @brief Inserts a %beta_distribution random number distribution * @brief Inserts a %beta_distribution random number distribution
* @p __x into the output stream @p __os. * @p __x into the output stream @p __os.
* *
...@@ -580,17 +590,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -580,17 +590,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** /**
* @brief Return true if two beta distributions have the same
* parameters and the sequences that would be generated
* are equal.
*/
template<typename _RealType>
inline bool
operator==(const __gnu_cxx::beta_distribution<_RealType>& __d1,
const __gnu_cxx::beta_distribution<_RealType>& __d2)
{ return __d1.param() == __d2.param(); }
/**
* @brief Return true if two beta distributions are different. * @brief Return true if two beta distributions are different.
*/ */
template<typename _RealType> template<typename _RealType>
...@@ -809,7 +808,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -809,7 +808,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
operator()(_UniformRandomNumberGenerator& __urng) operator()(_UniformRandomNumberGenerator& __urng)
{ return this->operator()(__urng, this->param()); } { return this->operator()(__urng, _M_param); }
template<typename _UniformRandomNumberGenerator> template<typename _UniformRandomNumberGenerator>
result_type result_type
...@@ -821,7 +820,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -821,7 +820,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ return this->__generate_impl(__f, __t, __urng, this->param()); } { return this->__generate_impl(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1073,7 +1072,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1073,7 +1072,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1098,7 +1097,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1098,7 +1097,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const rice_distribution& __d1, operator==(const rice_distribution& __d1,
const rice_distribution& __d2) const rice_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ndx == __d2._M_ndx && __d1._M_ndx == __d2._M_ndx
&& __d1._M_ndy == __d2._M_ndy); } && __d1._M_ndy == __d2._M_ndy); }
...@@ -1296,7 +1295,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1296,7 +1295,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1321,7 +1320,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1321,7 +1320,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const nakagami_distribution& __d1, operator==(const nakagami_distribution& __d1,
const nakagami_distribution& __d2) const nakagami_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_gd == __d2._M_gd); } && __d1._M_gd == __d2._M_gd); }
/** /**
...@@ -1532,7 +1531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1532,7 +1531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1557,7 +1556,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1557,7 +1556,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const pareto_distribution& __d1, operator==(const pareto_distribution& __d1,
const pareto_distribution& __d2) const pareto_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ud == __d2._M_ud); } && __d1._M_ud == __d2._M_ud); }
/** /**
...@@ -1774,7 +1773,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1774,7 +1773,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -1799,7 +1798,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1799,7 +1798,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const k_distribution& __d1, operator==(const k_distribution& __d1,
const k_distribution& __d2) const k_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_gd1 == __d2._M_gd1 && __d1._M_gd1 == __d2._M_gd1
&& __d1._M_gd2 == __d2._M_gd2); } && __d1._M_gd2 == __d2._M_gd2); }
...@@ -2006,7 +2005,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2006,7 +2005,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2031,7 +2030,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2031,7 +2030,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const arcsine_distribution& __d1, operator==(const arcsine_distribution& __d1,
const arcsine_distribution& __d2) const arcsine_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ud == __d2._M_ud); } && __d1._M_ud == __d2._M_ud); }
/** /**
...@@ -2241,7 +2240,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2241,7 +2240,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
__generate(_ForwardIterator __f, _ForwardIterator __t, __generate(_ForwardIterator __f, _ForwardIterator __t,
_UniformRandomNumberGenerator& __urng) _UniformRandomNumberGenerator& __urng)
{ this->__generate(__f, __t, __urng, this->param()); } { this->__generate(__f, __t, __urng, _M_param); }
template<typename _ForwardIterator, template<typename _ForwardIterator,
typename _UniformRandomNumberGenerator> typename _UniformRandomNumberGenerator>
...@@ -2266,7 +2265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2266,7 +2265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
friend bool friend bool
operator==(const hoyt_distribution& __d1, operator==(const hoyt_distribution& __d1,
const hoyt_distribution& __d2) const hoyt_distribution& __d2)
{ return (__d1.param() == __d2.param() { return (__d1._M_param == __d2._M_param
&& __d1._M_ad == __d2._M_ad && __d1._M_ad == __d2._M_ad
&& __d1._M_ed == __d2._M_ed); } && __d1._M_ed == __d2._M_ed); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment