From 36651afeec5fca8d1a0f00775b1586b1669f211f Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 30 Dec 2004 23:27:28 +0000 Subject: type_traits: Add has_trivial_copy, has_trivial_assign, has_nothrow_copy, has_nothrow_assign. 2004-12-30 Paolo Carlini * include/tr1/type_traits: Add has_trivial_copy, has_trivial_assign, has_nothrow_copy, has_nothrow_assign. * testsuite/testsuite_tr1.h: Add test_copy_property and test_assign_property. * testsuite/tr1/4_metaprogramming/type_properties/ has_nothrow_assign/has_nothrow_assign.cc: New. * testsuite/tr1/4_metaprogramming/type_properties/ has_nothrow_assign/typedefs.cc: Likewise. * testsuite/tr1/4_metaprogramming/type_properties/ has_nothrow_copy/has_nothrow_copy.cc: Likewise. * testsuite/tr1/4_metaprogramming/type_properties/ has_nothrow_copy/typedefs.cc: Likewise. * testsuite/tr1/4_metaprogramming/type_properties/ has_trivial_assign/has_trivial_assign.cc: Likewise. * testsuite/tr1/4_metaprogramming/type_properties/ has_trivial_assign/typedefs.cc: Likewise. * testsuite/tr1/4_metaprogramming/type_properties/ has_trivial_copy/has_trivial_copy.cc: Likewise. * testsuite/tr1/4_metaprogramming/type_properties/ has_trivial_copy/typedefs.cc: Likewise. From-SVN: r92745 --- libstdc++-v3/ChangeLog | 23 +++++++++ libstdc++-v3/include/tr1/type_traits | 22 ++++++++ libstdc++-v3/testsuite/testsuite_tr1.h | 34 +++++++++++++ .../has_nothrow_assign/has_nothrow_assign.cc | 59 ++++++++++++++++++++++ .../type_properties/has_nothrow_assign/typedefs.cc | 36 +++++++++++++ .../has_nothrow_copy/has_nothrow_copy.cc | 59 ++++++++++++++++++++++ .../type_properties/has_nothrow_copy/typedefs.cc | 36 +++++++++++++ .../has_trivial_assign/has_trivial_assign.cc | 59 ++++++++++++++++++++++ .../type_properties/has_trivial_assign/typedefs.cc | 36 +++++++++++++ .../has_trivial_copy/has_trivial_copy.cc | 59 ++++++++++++++++++++++ .../type_properties/has_trivial_copy/typedefs.cc | 36 +++++++++++++ 11 files changed, 459 insertions(+) create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a49240f..c723e1d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,26 @@ +2004-12-30 Paolo Carlini + + * include/tr1/type_traits: Add has_trivial_copy, has_trivial_assign, + has_nothrow_copy, has_nothrow_assign. + * testsuite/testsuite_tr1.h: Add test_copy_property and + test_assign_property. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_nothrow_assign/has_nothrow_assign.cc: New. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_nothrow_assign/typedefs.cc: Likewise. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_nothrow_copy/has_nothrow_copy.cc: Likewise. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_nothrow_copy/typedefs.cc: Likewise. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_trivial_assign/has_trivial_assign.cc: Likewise. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_trivial_assign/typedefs.cc: Likewise. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_trivial_copy/has_trivial_copy.cc: Likewise. + * testsuite/tr1/4_metaprogramming/type_properties/ + has_trivial_copy/typedefs.cc: Likewise. + 2004-12-29 Jonathan Wakely * include/bits/vector.tcc (erase(iterator, iterator), diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits index 3cca020..01dd96b 100644 --- a/libstdc++-v3/include/tr1/type_traits +++ b/libstdc++-v3/include/tr1/type_traits @@ -277,6 +277,17 @@ namespace tr1 : public integral_constant::value> { }; template + struct has_trivial_copy + : public integral_constant::value + && !is_volatile<_Tp>::value)> { }; + + template + struct has_trivial_assign + : public integral_constant::value + && !is_const<_Tp>::value + && !is_volatile<_Tp>::value)> { }; + + template struct has_trivial_destructor : public integral_constant::value> { }; @@ -284,6 +295,17 @@ namespace tr1 struct has_nothrow_constructor : public integral_constant::value> { }; + template + struct has_nothrow_copy + : public integral_constant::value + && !is_volatile<_Tp>::value)> { }; + + template + struct has_nothrow_assign + : public integral_constant::value + && !is_const<_Tp>::value + && !is_volatile<_Tp>::value)> { }; + template struct has_virtual_destructor : public false_type { }; diff --git a/libstdc++-v3/testsuite/testsuite_tr1.h b/libstdc++-v3/testsuite/testsuite_tr1.h index 0ad8ac1..aa7855c 100644 --- a/libstdc++-v3/testsuite/testsuite_tr1.h +++ b/libstdc++-v3/testsuite/testsuite_tr1.h @@ -62,6 +62,40 @@ namespace __gnu_test return ret; } + template class Property, + typename Type> + bool + test_copy_property(bool value) + { + bool ret = true; + ret &= Property::value == value; + ret &= Property::value == value; + ret &= Property::value == !value; + ret &= Property::value == !value; + ret &= Property::type::value == value; + ret &= Property::type::value == value; + ret &= Property::type::value == !value; + ret &= Property::type::value == !value; + return ret; + } + + template class Property, + typename Type> + bool + test_assign_property(bool value) + { + bool ret = true; + ret &= Property::value == value; + ret &= Property::value == !value; + ret &= Property::value == !value; + ret &= Property::value == !value; + ret &= Property::type::value == value; + ret &= Property::type::value == !value; + ret &= Property::type::value == !value; + ret &= Property::type::value == !value; + return ret; + } + template class Relationship, typename Type1, typename Type2> bool diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc new file mode 100644 index 0000000..76dbbb8 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/has_nothrow_assign.cc @@ -0,0 +1,59 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 4.5.3 Type properties + +#include +#include +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + using std::tr1::has_nothrow_assign; + using namespace __gnu_test; + + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_assign_property(true)) ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc new file mode 100644 index 0000000..88e61b9 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_assign/typedefs.cc @@ -0,0 +1,36 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// +// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES. + +#include + +// { dg-do compile } + +void test01() +{ + // Check for required typedefs + typedef std::tr1::has_nothrow_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; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc new file mode 100644 index 0000000..a596465 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/has_nothrow_copy.cc @@ -0,0 +1,59 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 4.5.3 Type properties + +#include +#include +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + using std::tr1::has_nothrow_copy; + using namespace __gnu_test; + + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_copy_property(true)) ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc new file mode 100644 index 0000000..e786db3 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_copy/typedefs.cc @@ -0,0 +1,36 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// +// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES. + +#include + +// { dg-do compile } + +void test01() +{ + // Check for required typedefs + typedef std::tr1::has_nothrow_copy 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; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc new file mode 100644 index 0000000..a85bcad --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/has_trivial_assign.cc @@ -0,0 +1,59 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 4.5.3 Type properties + +#include +#include +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + using std::tr1::has_trivial_assign; + using namespace __gnu_test; + + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + VERIFY( (test_assign_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_assign_property(true)) ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc new file mode 100644 index 0000000..a63106f --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_assign/typedefs.cc @@ -0,0 +1,36 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// +// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES. + +#include + +// { dg-do compile } + +void test01() +{ + // Check for required typedefs + typedef std::tr1::has_trivial_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; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc new file mode 100644 index 0000000..6002b85 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/has_trivial_copy.cc @@ -0,0 +1,59 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 4.5.3 Type properties + +#include +#include +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + using std::tr1::has_trivial_copy; + using namespace __gnu_test; + + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + VERIFY( (test_copy_property(true)) ); + // Temporarily disabled because of c++/19076 :-( + // VERIFY( (test_copy_property(true)) ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc new file mode 100644 index 0000000..7d181e3 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_copy/typedefs.cc @@ -0,0 +1,36 @@ +// 2004-12-30 Paolo Carlini +// +// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// +// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES. + +#include + +// { dg-do compile } + +void test01() +{ + // Check for required typedefs + typedef std::tr1::has_trivial_copy 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; +} -- cgit v1.1