From: Jonathan Wakely Date: Tue, 28 Apr 2015 12:35:30 +0000 (+0100) Subject: re PR libstdc++/65631 (seed_seq should not be copyable) X-Git-Tag: releases/gcc-6.1.0~7623 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d747ee05e36de80e530ad7d361750bba5c890342;p=thirdparty%2Fgcc.git re PR libstdc++/65631 (seed_seq should not be copyable) PR libstdc++/65631 * include/bits/random.h (seed_seq) Define copy constructor and copy assignment as deleted. * testsuite/26_numerics/random/seed_seq/cons/65631.cc: New. From-SVN: r222524 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 159362d412ac..c0f292459d28 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2015-04-28 Jonathan Wakely + PR libstdc++/65631 + * include/bits/random.h (seed_seq) Define copy constructor and copy + assignment as deleted. + * testsuite/26_numerics/random/seed_seq/cons/65631.cc: New. + * libsupc++/exception (uncaught_exceptions): Add comment. Reorder #if. * testsuite/18_support/uncaught_exceptions/uncaught_exceptions.cc: Use -std=gnu++1z. Check feature-test macro. diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index 8caade508270..501243db541e 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -6053,6 +6053,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION param(OutputIterator __dest) const { std::copy(_M_v.begin(), _M_v.end(), __dest); } + // no copy functions + seed_seq(const seed_seq&) = delete; + seed_seq& operator=(const seed_seq&) = delete; + private: /// std::vector _M_v; diff --git a/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/65631.cc b/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/65631.cc new file mode 100644 index 000000000000..cdc4e5747b70 --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/65631.cc @@ -0,0 +1,28 @@ +// Copyright (C) 2015 Free 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 +// . + +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +#include +#include + +static_assert( !std::is_copy_constructible::value, + "seed_seq is not copy constructible" ); + +static_assert( !std::is_copy_assignable::value, + "seed_seq is not copy assignable" );