public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-1941] libstdc++: Suppress redundant definitions of static members in <random> Date: Thu, 1 Jul 2021 00:08:29 +0000 (GMT) [thread overview] Message-ID: <20210701000829.CDF58385480A@sourceware.org> (raw) https://gcc.gnu.org/g:996be6b670b9f85727a6ae98c8095ca9cfbc0f67 commit r12-1941-g996be6b670b9f85727a6ae98c8095ca9cfbc0f67 Author: Jonathan Wakely <jwakely@redhat.com> Date: Wed Jun 30 15:47:41 2021 +0100 libstdc++: Suppress redundant definitions of static members in <random> Since C++17 the static members of the random number engines are implicitly inline, so don't need definitions. Signed-off-by: Jonathan Wakely <jwakely@redhat.com> libstdc++-v3/ChangeLog: * include/bits/random.tcc [__cpp_inline_variables]: Remove redundant definitions of static constexpr member variables. * testsuite/26_numerics/random/pr60037-neg.cc: Adjust dg-error line number. Diff: --- libstdc++-v3/include/bits/random.tcc | 12 ++++++++---- libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index 8e2b702b0be..f28163ec03d 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -186,7 +186,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __is; } - +#if ! __cpp_inline_variables template<typename _UIntType, size_t __w, size_t __n, size_t __m, size_t __r, _UIntType __a, size_t __u, _UIntType __d, size_t __s, @@ -313,6 +313,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr _UIntType mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::default_seed; +#endif template<typename _UIntType, size_t __w, size_t __n, size_t __m, size_t __r, @@ -515,7 +516,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __is; } - +#if ! __cpp_inline_variables template<typename _UIntType, size_t __w, size_t __s, size_t __r> constexpr size_t subtract_with_carry_engine<_UIntType, __w, __s, __r>::word_size; @@ -531,6 +532,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _UIntType, size_t __w, size_t __s, size_t __r> constexpr _UIntType subtract_with_carry_engine<_UIntType, __w, __s, __r>::default_seed; +#endif template<typename _UIntType, size_t __w, size_t __s, size_t __r> void @@ -666,7 +668,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __is; } - +#if ! __cpp_inline_variables template<typename _RandomNumberEngine, size_t __p, size_t __r> constexpr size_t discard_block_engine<_RandomNumberEngine, __p, __r>::block_size; @@ -674,6 +676,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _RandomNumberEngine, size_t __p, size_t __r> constexpr size_t discard_block_engine<_RandomNumberEngine, __p, __r>::used_block; +#endif template<typename _RandomNumberEngine, size_t __p, size_t __r> typename discard_block_engine<_RandomNumberEngine, @@ -799,10 +802,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __sum; } - +#if ! __cpp_inline_variables template<typename _RandomNumberEngine, size_t __k> constexpr size_t shuffle_order_engine<_RandomNumberEngine, __k>::table_size; +#endif namespace __detail { diff --git a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc index ba252ef34fe..ae03b5693c2 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc @@ -12,4 +12,4 @@ auto x = std::generate_canonical<std::size_t, // { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 167 } -// { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 3346 } +// { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 3350 }
reply other threads:[~2021-07-01 0:08 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210701000829.CDF58385480A@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).