From patchwork Tue Jun 8 17:53:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] Rename has_nothrow_assign to has_nothrow_copy_assign and has_trivial_assign to has_trivial_copy_assign Date: Tue, 08 Jun 2010 07:53:45 -0000 From: Paolo Carlini X-Patchwork-Id: 55012 Message-Id: <4C0E83A9.3070101@oracle.com> To: "gcc-patches@gcc.gnu.org" Cc: libstdc++ Hi, just a rename + a bare minimum of initial testcases, now to the interesting bits... Tested x86_64-linux, committed to mainline. Paolo. ////////////////////// 2010-06-08 Paolo Carlini * include/std/type_traits (has_nothrow_assign): Rename to has_nothrow_copy_assign. (has_trivial_assign): Rename to has_trivial_copy_assign. * testsuite/20_util/has_nothrow_copy_assign/value.cc: New. * testsuite/20_util/has_nothrow_copy_assign/requirements/ typedefs.cc: Likewise. * testsuite/20_util/has_nothrow_copy_assign/requirements/ explicit_instantiation.cc: Likewise. * testsuite/20_util/has_trivial_copy_assign/value.cc: Likewise. * testsuite/20_util/has_trivial_copy_assign/requirements/ typedefs.cc: Likewise. * testsuite/20_util/has_trivial_copy_assign/requirements/ explicit_instantiation.cc: Likewise. Index: include/std/type_traits =================================================================== --- include/std/type_traits (revision 160437) +++ include/std/type_traits (working copy) @@ -246,9 +246,9 @@ : public integral_constant { }; - /// has_trivial_assign + /// has_trivial_copy_assign template - struct has_trivial_assign + struct has_trivial_copy_assign : public integral_constant { }; @@ -270,9 +270,9 @@ : public integral_constant { }; - /// has_nothrow_assign + /// has_nothrow_copy_assign template - struct has_nothrow_assign + struct has_nothrow_copy_assign : public integral_constant { }; Index: testsuite/20_util/has_nothrow_copy_assign/value.cc =================================================================== --- testsuite/20_util/has_nothrow_copy_assign/value.cc (revision 0) +++ testsuite/20_util/has_nothrow_copy_assign/value.cc (revision 0) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++0x" } +// 2010-06-08 Paolo Carlini +// +// Copyright (C) 2010 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 +// . + +#include +#include +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + using std::has_nothrow_copy_assign; + using namespace __gnu_test; + + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + + // Negative tests. + VERIFY( (test_property(false)) ); +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc =================================================================== --- testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc (revision 0) +++ testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc (revision 0) @@ -0,0 +1,36 @@ +// { dg-options "-std=gnu++0x" } +// 2010-06-08 Paolo Carlini +// +// Copyright (C) 2010 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 +// . + +// +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +// { dg-do compile } + +void test01() +{ + // Check for required typedefs + typedef std::has_nothrow_copy_assign test_type; + typedef test_type::value_type value_type; + typedef test_type::type type; + typedef test_type::type::value_type type_value_type; + typedef test_type::type::type type_type; +} Index: testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc =================================================================== --- testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc (revision 0) +++ testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc (revision 0) @@ -0,0 +1,30 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } +// 2010-06-08 Paolo Carlini + +// Copyright (C) 2010 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 +// . + +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +namespace std +{ + typedef short test_type; + template struct has_nothrow_copy_assign; +} Index: testsuite/20_util/has_trivial_copy_assign/value.cc =================================================================== --- testsuite/20_util/has_trivial_copy_assign/value.cc (revision 0) +++ testsuite/20_util/has_trivial_copy_assign/value.cc (revision 0) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++0x" } +// 2010-06-08 Paolo Carlini +// +// Copyright (C) 2010 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 +// . + +#include +#include +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + using std::has_trivial_copy_assign; + using namespace __gnu_test; + + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + VERIFY( (test_property(true)) ); + + // Negative tests. + VERIFY( (test_property(false)) ); +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc =================================================================== --- testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc (revision 0) +++ testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc (revision 0) @@ -0,0 +1,36 @@ +// { dg-options "-std=gnu++0x" } +// 2010-06-08 Paolo Carlini +// +// Copyright (C) 2010 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 +// . + +// +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +// { dg-do compile } + +void test01() +{ + // Check for required typedefs + typedef std::has_trivial_copy_assign test_type; + typedef test_type::value_type value_type; + typedef test_type::type type; + typedef test_type::type::value_type type_value_type; + typedef test_type::type::type type_type; +} Index: testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc =================================================================== --- testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc (revision 0) +++ testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc (revision 0) @@ -0,0 +1,30 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } +// 2010-06-08 Paolo Carlini + +// Copyright (C) 2010 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 +// . + +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +namespace std +{ + typedef short test_type; + template struct has_trivial_copy_assign; +}