diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 33489e2cc9a..42ef92a6bd4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,20 @@ +2012-09-16 Paolo Carlini + + * 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. + 2012-09-14 Edward Smith-Rowland <3dw4rd@verizon.net> * include/ext/random: Add __gnu_cxx::rice_distribution<> class. 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::value> + std::enable_if::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 - 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 diff --git a/libstdc++-v3/testsuite/26_numerics/random/beta_distribution/cons/default.cc b/libstdc++-v3/testsuite/ext/random/beta_distribution/cons/default.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/beta_distribution/cons/default.cc rename to libstdc++-v3/testsuite/ext/random/beta_distribution/cons/default.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/beta_distribution/cons/parms.cc b/libstdc++-v3/testsuite/ext/random/beta_distribution/cons/parms.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/beta_distribution/cons/parms.cc rename to libstdc++-v3/testsuite/ext/random/beta_distribution/cons/parms.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/beta_distribution/operators/equal.cc b/libstdc++-v3/testsuite/ext/random/beta_distribution/operators/equal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/beta_distribution/operators/equal.cc rename to libstdc++-v3/testsuite/ext/random/beta_distribution/operators/equal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/beta_distribution/operators/inequal.cc b/libstdc++-v3/testsuite/ext/random/beta_distribution/operators/inequal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/beta_distribution/operators/inequal.cc rename to libstdc++-v3/testsuite/ext/random/beta_distribution/operators/inequal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/beta_distribution/operators/serialize.cc b/libstdc++-v3/testsuite/ext/random/beta_distribution/operators/serialize.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/beta_distribution/operators/serialize.cc rename to libstdc++-v3/testsuite/ext/random/beta_distribution/operators/serialize.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/beta_distribution/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/ext/random/beta_distribution/requirements/explicit_instantiation/1.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/beta_distribution/requirements/explicit_instantiation/1.cc rename to libstdc++-v3/testsuite/ext/random/beta_distribution/requirements/explicit_instantiation/1.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/beta_distribution/requirements/typedefs.cc b/libstdc++-v3/testsuite/ext/random/beta_distribution/requirements/typedefs.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/beta_distribution/requirements/typedefs.cc rename to libstdc++-v3/testsuite/ext/random/beta_distribution/requirements/typedefs.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/cons/default.cc b/libstdc++-v3/testsuite/ext/random/normal_mv_distribution/cons/default.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/cons/default.cc rename to libstdc++-v3/testsuite/ext/random/normal_mv_distribution/cons/default.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/cons/parms.cc b/libstdc++-v3/testsuite/ext/random/normal_mv_distribution/cons/parms.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/cons/parms.cc rename to libstdc++-v3/testsuite/ext/random/normal_mv_distribution/cons/parms.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/operators/equal.cc b/libstdc++-v3/testsuite/ext/random/normal_mv_distribution/operators/equal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/operators/equal.cc rename to libstdc++-v3/testsuite/ext/random/normal_mv_distribution/operators/equal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/operators/inequal.cc b/libstdc++-v3/testsuite/ext/random/normal_mv_distribution/operators/inequal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/operators/inequal.cc rename to libstdc++-v3/testsuite/ext/random/normal_mv_distribution/operators/inequal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/operators/serialize.cc b/libstdc++-v3/testsuite/ext/random/normal_mv_distribution/operators/serialize.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/operators/serialize.cc rename to libstdc++-v3/testsuite/ext/random/normal_mv_distribution/operators/serialize.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/ext/random/normal_mv_distribution/requirements/explicit_instantiation/1.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/requirements/explicit_instantiation/1.cc rename to libstdc++-v3/testsuite/ext/random/normal_mv_distribution/requirements/explicit_instantiation/1.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/requirements/typedefs.cc b/libstdc++-v3/testsuite/ext/random/normal_mv_distribution/requirements/typedefs.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/normal_mv_distribution/requirements/typedefs.cc rename to libstdc++-v3/testsuite/ext/random/normal_mv_distribution/requirements/typedefs.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/rice_distribution/cons/default.cc b/libstdc++-v3/testsuite/ext/random/rice_distribution/cons/default.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/rice_distribution/cons/default.cc rename to libstdc++-v3/testsuite/ext/random/rice_distribution/cons/default.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/rice_distribution/cons/parms.cc b/libstdc++-v3/testsuite/ext/random/rice_distribution/cons/parms.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/rice_distribution/cons/parms.cc rename to libstdc++-v3/testsuite/ext/random/rice_distribution/cons/parms.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/rice_distribution/operators/equal.cc b/libstdc++-v3/testsuite/ext/random/rice_distribution/operators/equal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/rice_distribution/operators/equal.cc rename to libstdc++-v3/testsuite/ext/random/rice_distribution/operators/equal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/rice_distribution/operators/inequal.cc b/libstdc++-v3/testsuite/ext/random/rice_distribution/operators/inequal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/rice_distribution/operators/inequal.cc rename to libstdc++-v3/testsuite/ext/random/rice_distribution/operators/inequal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/rice_distribution/operators/serialize.cc b/libstdc++-v3/testsuite/ext/random/rice_distribution/operators/serialize.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/rice_distribution/operators/serialize.cc rename to libstdc++-v3/testsuite/ext/random/rice_distribution/operators/serialize.cc diff --git a/libstdc++-v3/testsuite/ext/random/rice_distribution/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/ext/random/rice_distribution/requirements/explicit_instantiation/1.cc new file mode 100644 index 00000000000..2026c9ec51d --- /dev/null +++ b/libstdc++-v3/testsuite/ext/random/rice_distribution/requirements/explicit_instantiation/1.cc @@ -0,0 +1,26 @@ +// { dg-do compile } +// { dg-options "-std=c++11" } +// { dg-require-cstdint "" } +// +// Copyright (C) 2012 Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +template class __gnu_cxx::rice_distribution; +template class __gnu_cxx::rice_distribution; +template class __gnu_cxx::rice_distribution; diff --git a/libstdc++-v3/testsuite/26_numerics/random/rice_distribution/requirements/typedefs.cc b/libstdc++-v3/testsuite/ext/random/rice_distribution/requirements/typedefs.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/rice_distribution/requirements/typedefs.cc rename to libstdc++-v3/testsuite/ext/random/rice_distribution/requirements/typedefs.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/copy.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/copy.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/copy.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/copy.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/default.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/default.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/default.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/default.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/seed1.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/seed1.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/seed1.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/seed1.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/seed2.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/seed2.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/seed2.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/seed2.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/seed_seq.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/seed_seq.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/cons/seed_seq.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/cons/seed_seq.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/operators/equal.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/operators/equal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/operators/equal.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/operators/equal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/operators/inequal.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/operators/inequal.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/operators/inequal.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/operators/inequal.cc diff --git a/libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/operators/serialize.cc b/libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/operators/serialize.cc similarity index 100% rename from libstdc++-v3/testsuite/26_numerics/random/simd_fast_mersenne_twister_engine/operators/serialize.cc rename to libstdc++-v3/testsuite/ext/random/simd_fast_mersenne_twister_engine/operators/serialize.cc