diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2012-09-16 22:28:21 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo.carlini@oracle.com> | 2012-09-16 22:28:21 +0000 |
| commit | 231ba6cfec58191557d7d263cca011f2fccdad43 (patch) | |
| tree | 9e77a707d0750d4e73352d54cc4c2e86ee0071e9 /libstdc++-v3/include/ext | |
| parent | a352cb979f37dad94046b69f5b55135dc366272f (diff) | |
2012-09-16 Paolo Carlini <paolo.carlini@oracle.com>
* include/ext/random (rice_distribution<>::operator==): Change
inline friend definition to non-template.
* testsuite/ext/random/rice_distribution/requirements/
explicit_instantiation/1.cc: New.
* testsuite/26_numerics/random/normal_mv_distribution: Move...
* testsuite/ext/random/normal_mv_distribution: ... here.
* testsuite/26_numerics/random/simd_fast_mersenne_twister_engine:
Move...
* testsuite/ext/random/simd_fast_mersenne_twister_engine: ... here.
* testsuite/26_numerics/random/beta_distribution: Move...
* testsuite/ext/random/beta_distribution: ... here.
* testsuite/26_numerics/random/rice_distribution: Move...
* testsuite/ext/random/rice_distribution: ... here.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@191367 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext')
| -rw-r--r-- | libstdc++-v3/include/ext/random | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libstdc++-v3/include/ext/random b/libstdc++-v3/include/ext/random index 3011f39109a..e53204074fc 100644 --- a/libstdc++-v3/include/ext/random +++ b/libstdc++-v3/include/ext/random @@ -87,7 +87,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { seed(__sd); } template<typename _Sseq, typename = typename - std::enable_if<!std::is_same<_Sseq, simd_fast_mersenne_twister_engine>::value> + std::enable_if<!std::is_same<_Sseq, + simd_fast_mersenne_twister_engine>::value> ::type> explicit simd_fast_mersenne_twister_engine(_Sseq& __q) @@ -149,7 +150,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename _CharT, typename _Traits> friend std::basic_ostream<_CharT, _Traits>& operator<<(std::basic_ostream<_CharT, _Traits>& __os, - const __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType_2, + const __gnu_cxx::simd_fast_mersenne_twister_engine + <_UIntType_2, __m_2, __pos1_2, __sl1_2, __sl2_2, __sr1_2, __sr2_2, __msk1_2, __msk2_2, __msk3_2, __msk4_2, __parity1_2, __parity2_2, __parity3_2, __parity4_2>& __x); @@ -1079,13 +1081,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * the same parameters and the sequences that would * be generated are equal. */ - template<typename _RealType1> - friend bool - operator==(const rice_distribution<_RealType1>& __d1, - const rice_distribution<_RealType1>& __d2) - { return (__d1.param() == __d2.param() - && __d1._M_ndx == __d2._M_ndx - && __d1._M_ndy == __d2._M_ndy); } + friend bool + operator==(const rice_distribution& __d1, + const rice_distribution& __d2) + { return (__d1.param() == __d2.param() + && __d1._M_ndx == __d2._M_ndx + && __d1._M_ndy == __d2._M_ndy); } /** * @brief Inserts a %rice_distribution random number distribution |