This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[v3] Adjust <random> static_asserts
- From: Paolo Carlini <paolo dot carlini at oracle dot com>
- To: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>
- Cc: libstdc++ <libstdc++ at gcc dot gnu dot org>
- Date: Mon, 12 Oct 2009 21:14:01 +0200
- Subject: [v3] Adjust <random> static_asserts
Hi,
tested x86_64-linux, committed to mainline.
Paolo.
//////////////////
2009-10-12 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/random.h (class linear_congruential_engine,
class mersenne_twister_engine, class subtract_with_carry_engine,
class discard_block_engine, class independent_bits_engine,
class shuffle_order_engine, class uniform_int_distribution,
class binomial_distribution, class geometric_distribution,
class negative_binomial_distribution, class poisson_distribution,
class discrete_distribution): Do not use simulated concept checks,
tidy startic_asserts on argument types and ranges.
(class uniform_real_distribution, class normal_distribution,
class lognormal_distribution, class gamma_distribution,
class chi_squared_distribution, class cauchy_distribution,
class fisher_f_distribution, class student_t_distribution,
class exponential_distribution, class weibull_distribution,
class extreme_value_distribution, class piecewise_linear_distribution,
class piecewise_constant_distribution): Add static_assert on
template argument type.
* include/std/random: Do not include <bits/concept_check.h>.
* testsuite/26_numerics/random/discard_block_engine/cons/base_move.cc:
Fix.
* testsuite/26_numerics/random/discard_block_engine/cons/seed1.cc:
Likewise.
* testsuite/26_numerics/random/discard_block_engine/cons/seed2.cc:
Likewise.
* testsuite/26_numerics/random/discard_block_engine/cons/base_copy.cc:
Likewise.
* testsuite/26_numerics/random/discard_block_engine/cons/default.cc:
Likewise.
* testsuite/26_numerics/random/discard_block_engine/cons/seed_seq.cc:
Likewise.
* testsuite/26_numerics/random/discard_block_engine/requirements/
typedefs.cc: Likewise.
* testsuite/26_numerics/random/discard_block_engine/operators/
equal.cc: Likewise.
* testsuite/26_numerics/random/discard_block_engine/operators/
serialize.cc: Likewise.
* testsuite/26_numerics/random/linear_congruential_engine/
requirements/non_uint_neg.cc: Tweak.
Index: include/std/random
===================================================================
--- include/std/random (revision 152667)
+++ include/std/random (working copy)
@@ -43,7 +43,6 @@
#include <limits>
#include <ext/type_traits.h>
#include <ext/numeric_traits.h>
-#include <bits/concept_check.h>
#include <debug/debug.h>
#include <type_traits>
Index: include/bits/random.h
===================================================================
--- include/bits/random.h (revision 152667)
+++ include/bits/random.h (working copy)
@@ -32,7 +32,6 @@
namespace std
{
-
// [26.4] Random number generation
/**
@@ -154,10 +153,10 @@
template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
class linear_congruential_engine
{
- __glibcxx_class_requires(_UIntType, _UnsignedIntegerConcept)
- static_assert(__m == 0 || (__a < __m && __c < __m),
- "template arguments out of bounds"
- " in linear_congruential_engine");
+ static_assert(std::is_unsigned<_UIntType>::value, "template argument "
+ "_UIntType not an unsigned integral type");
+ static_assert(__m == 0u || (__a < __m && __c < __m),
+ "template argument __m out of bounds");
public:
/** The type of the generated random value. */
@@ -341,35 +340,27 @@
_UIntType __c, size_t __l, _UIntType __f>
class mersenne_twister_engine
{
- __glibcxx_class_requires(_UIntType, _UnsignedIntegerConcept)
-
- static_assert(__m >= 1U,
- "mersenne_twister_engine template arguments out of bounds");
- static_assert(__n >= __m,
- "mersenne_twister_engine template arguments out of bounds");
- static_assert(__w >= __r,
- "mersenne_twister_engine template arguments out of bounds");
- static_assert(__w >= __u,
- "mersenne_twister_engine template arguments out of bounds");
- static_assert(__w >= __s,
- "mersenne_twister_engine template arguments out of bounds");
- static_assert(__w >= __t,
- "mersenne_twister_engine template arguments out of bounds");
- static_assert(__w >= __l,
- "mersenne_twister_engine template arguments out of bounds");
- static_assert(__w <=
- static_cast<size_t>(std::numeric_limits<_UIntType>::digits),
- "mersenne_twister_engine template arguments out of bounds");
+ static_assert(std::is_unsigned<_UIntType>::value, "template argument "
+ "_UIntType not an unsigned integral type");
+ static_assert(1u <= __m && __m <= __n,
+ "template argument __m out of bounds");
+ static_assert(__r <= __w, "template argument __r out of bound");
+ static_assert(__u <= __w, "template argument __u out of bound");
+ static_assert(__s <= __w, "template argument __s out of bound");
+ static_assert(__t <= __w, "template argument __t out of bound");
+ static_assert(__l <= __w, "template argument __l out of bound");
+ static_assert(__w <= std::numeric_limits<_UIntType>::digits,
+ "template argument __w out of bound");
static_assert(__a <= (__detail::_Shift<_UIntType, __w>::__value - 1),
- "mersenne_twister_engine template arguments out of bounds");
+ "template argument __a out of bound");
static_assert(__b <= (__detail::_Shift<_UIntType, __w>::__value - 1),
- "mersenne_twister_engine template arguments out of bounds");
+ "template argument __b out of bound");
static_assert(__c <= (__detail::_Shift<_UIntType, __w>::__value - 1),
- "mersenne_twister_engine template arguments out of bounds");
+ "template argument __c out of bound");
static_assert(__d <= (__detail::_Shift<_UIntType, __w>::__value - 1),
- "mersenne_twister_engine template arguments out of bounds");
+ "template argument __d out of bound");
static_assert(__f <= (__detail::_Shift<_UIntType, __w>::__value - 1),
- "mersenne_twister_engine template arguments out of bounds");
+ "template argument __f out of bound");
public:
/** The type of the generated random value. */
@@ -538,13 +529,12 @@
template<typename _UIntType, size_t __w, size_t __s, size_t __r>
class subtract_with_carry_engine
{
- __glibcxx_class_requires(_UIntType, _UnsignedIntegerConcept)
- static_assert(__s > 0U && __r > __s
- && __w > 0U
- && __w <= static_cast<size_t>
- (std::numeric_limits<_UIntType>::digits),
- "template arguments out of bounds"
- " in subtract_with_carry_engine");
+ static_assert(std::is_unsigned<_UIntType>::value, "template argument "
+ "_UIntType not an unsigned integral type");
+ static_assert(0u < __s && __s < __r,
+ "template argument __s out of bounds");
+ static_assert(0u < __w && __w <= std::numeric_limits<_UIntType>::digits,
+ "template argument __w out of bounds");
public:
/** The type of the generated random value. */
@@ -702,9 +692,8 @@
template<typename _RandomNumberEngine, size_t __p, size_t __r>
class discard_block_engine
{
- static_assert(__r >= 1U && __p >= __r,
- "template arguments out of bounds"
- " in discard_block_engine");
+ static_assert(1 <= __r && __r <= __p,
+ "template argument __r out of bounds");
public:
/** The type of the generated random value. */
@@ -903,12 +892,10 @@
template<typename _RandomNumberEngine, size_t __w, typename _UIntType>
class independent_bits_engine
{
- static_assert(__w > 0U
- && __w <=
- static_cast<size_t>
- (std::numeric_limits<_UIntType>::digits),
- "template arguments out of bounds "
- "in independent_bits_engine");
+ static_assert(std::is_unsigned<_UIntType>::value, "template argument "
+ "_UIntType not an unsigned integral type");
+ static_assert(0u < __w && __w <= std::numeric_limits<_UIntType>::digits,
+ "template argument __w out of bounds");
public:
/** The type of the generated random value. */
@@ -1102,9 +1089,7 @@
template<typename _RandomNumberEngine, size_t __k>
class shuffle_order_engine
{
- static_assert(__k >= 1U,
- "template arguments out of bounds"
- " in shuffle_order_engine");
+ static_assert(1u <= __k, "template argument __k out of bound");
public:
/** The type of the generated random value. */
@@ -1480,7 +1465,8 @@
template<typename _IntType = int>
class uniform_int_distribution
{
- __glibcxx_class_requires(_IntType, _IntegerConcept)
+ static_assert(std::is_integral<_IntType>::value,
+ "template argument not an integral type");
public:
/** The type of the range of the distribution. */
@@ -1633,6 +1619,9 @@
template<typename _RealType = double>
class uniform_real_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -1791,6 +1780,9 @@
template<typename _RealType = double>
class normal_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -1943,6 +1935,9 @@
template<typename _RealType = double>
class lognormal_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -2086,6 +2081,9 @@
template<typename _RealType = double>
class gamma_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -2243,6 +2241,9 @@
template<typename _RealType = double>
class chi_squared_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -2378,6 +2379,9 @@
template<typename _RealType = double>
class cauchy_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -2519,6 +2523,9 @@
template<typename _RealType = double>
class fisher_f_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -2670,6 +2677,9 @@
template<typename _RealType = double>
class student_t_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -2972,7 +2982,8 @@
template<typename _IntType = int>
class binomial_distribution
{
- __glibcxx_class_requires(_IntType, _IntegerConcept)
+ static_assert(std::is_integral<_IntType>::value,
+ "template argument not an integral type");
public:
/** The type of the range of the distribution. */
@@ -3142,7 +3153,8 @@
template<typename _IntType = int>
class geometric_distribution
{
- __glibcxx_class_requires(_IntType, _IntegerConcept)
+ static_assert(std::is_integral<_IntType>::value,
+ "template argument not an integral type");
public:
/** The type of the range of the distribution. */
@@ -3287,7 +3299,8 @@
template<typename _IntType = int>
class negative_binomial_distribution
{
- __glibcxx_class_requires(_IntType, _IntegerConcept)
+ static_assert(std::is_integral<_IntType>::value,
+ "template argument not an integral type");
public:
/** The type of the range of the distribution. */
@@ -3439,7 +3452,8 @@
template<typename _IntType = int>
class poisson_distribution
{
- __glibcxx_class_requires(_IntType, _IntegerConcept)
+ static_assert(std::is_integral<_IntType>::value,
+ "template argument not an integral type");
public:
/** The type of the range of the distribution. */
@@ -3594,6 +3608,9 @@
template<typename _RealType = double>
class exponential_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -3736,6 +3753,9 @@
template<typename _RealType = double>
class weibull_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -3879,6 +3899,9 @@
template<typename _RealType = double>
class extreme_value_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -4021,7 +4044,8 @@
template<typename _IntType = int>
class discrete_distribution
{
- __glibcxx_class_requires(_IntType, _IntegerConcept)
+ static_assert(std::is_integral<_IntType>::value,
+ "template argument not an integral type");
public:
/** The type of the range of the distribution. */
@@ -4185,6 +4209,9 @@
template<typename _RealType = double>
class piecewise_constant_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
@@ -4363,6 +4390,9 @@
template<typename _RealType = double>
class piecewise_linear_distribution
{
+ static_assert(std::is_floating_point<_RealType>::value,
+ "template argument not a floating point type");
+
public:
/** The type of the range of the distribution. */
typedef _RealType result_type;
Index: testsuite/26_numerics/random/discard_block_engine/cons/base_move.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/cons/base_move.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/cons/base_move.cc (working copy)
@@ -31,7 +31,7 @@
{
bool test __attribute__((unused)) = true;
- typedef std::subtract_with_carry_engine<long, 24, 10, 24>
+ typedef std::subtract_with_carry_engine<unsigned long, 24, 10, 24>
base_engine;
std::discard_block_engine<base_engine, 389, 24>
Index: testsuite/26_numerics/random/discard_block_engine/cons/seed1.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/cons/seed1.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/cons/seed1.cc (working copy)
@@ -35,7 +35,7 @@
std::discard_block_engine
<
- std::subtract_with_carry_engine<long, 24, 10, 24>,
+ std::subtract_with_carry_engine<unsigned long, 24, 10, 24>,
389, 24
> e(seed);
}
Index: testsuite/26_numerics/random/discard_block_engine/cons/seed2.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/cons/seed2.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/cons/seed2.cc (working copy)
@@ -35,7 +35,7 @@
std::discard_block_engine
<
- std::subtract_with_carry_engine<long, 24, 10, 24>,
+ std::subtract_with_carry_engine<unsigned long, 24, 10, 24>,
389, 24
> e(seed);
}
Index: testsuite/26_numerics/random/discard_block_engine/cons/base_copy.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/cons/base_copy.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/cons/base_copy.cc (working copy)
@@ -31,7 +31,7 @@
{
bool test __attribute__((unused)) = true;
- typedef std::subtract_with_carry_engine<long, 24, 10, 24>
+ typedef std::subtract_with_carry_engine<unsigned long, 24, 10, 24>
base_engine;
base_engine b;
Index: testsuite/26_numerics/random/discard_block_engine/cons/default.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/cons/default.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/cons/default.cc (working copy)
@@ -33,7 +33,7 @@
std::discard_block_engine
<
- std::subtract_with_carry_engine<long, 24, 10, 24>,
+ std::subtract_with_carry_engine<unsigned long, 24, 10, 24>,
389, 24
> e;
}
Index: testsuite/26_numerics/random/discard_block_engine/cons/seed_seq.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/cons/seed_seq.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/cons/seed_seq.cc (working copy)
@@ -35,7 +35,7 @@
std::discard_block_engine
<
- std::subtract_with_carry_engine<long, 24, 10, 24>,
+ std::subtract_with_carry_engine<unsigned long, 24, 10, 24>,
389, 24
> e(seq);
}
Index: testsuite/26_numerics/random/discard_block_engine/requirements/typedefs.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/requirements/typedefs.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/requirements/typedefs.cc (working copy)
@@ -31,7 +31,7 @@
{
typedef std::discard_block_engine
<
- std::subtract_with_carry_engine<long, 24, 10, 24>,
+ std::subtract_with_carry_engine<unsigned long, 24, 10, 24>,
389, 24
> test_type;
Index: testsuite/26_numerics/random/discard_block_engine/operators/equal.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/operators/equal.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/operators/equal.cc (working copy)
@@ -33,7 +33,7 @@
std::discard_block_engine
<
- std::subtract_with_carry_engine<long, 24, 10, 24>,
+ std::subtract_with_carry_engine<unsigned long, 24, 10, 24>,
389, 24
> u, v;
Index: testsuite/26_numerics/random/discard_block_engine/operators/serialize.cc
===================================================================
--- testsuite/26_numerics/random/discard_block_engine/operators/serialize.cc (revision 152667)
+++ testsuite/26_numerics/random/discard_block_engine/operators/serialize.cc (working copy)
@@ -35,7 +35,7 @@
std::stringstream str;
std::discard_block_engine
<
- std::subtract_with_carry_engine<long, 24, 10, 24>,
+ std::subtract_with_carry_engine<unsigned long, 24, 10, 24>,
389, 24
> u, v;
Index: testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc
===================================================================
--- testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc (revision 152667)
+++ testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc (working copy)
@@ -19,7 +19,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
-// { dg-options "-std=c++0x -D_GLIBCXX_CONCEPT_CHECKS" }
+// { dg-options "-std=c++0x" }
// { dg-require-cstdint "" }
// { dg-error "not a valid type" "" { target *-*-* } 32 }
// { dg-error "invalid type" "" { target *-*-* } 32 }