diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8f758db901db..22a7ed4fdb00 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,29 +1,41 @@ +2005-03-03 Paolo Carlini + + * include/tr1/type_traits: Implemenet is_polymorphic. + (is_empty): Minor tweaks. + * testsuite/testsuite_tr1.h: Add test types. + * testsuite/tr1/4_metaprogramming/type_properties/ + is_polymorphic/is_polymorphic.cc: New. + * testsuite/tr1/4_metaprogramming/type_properties/ + is_polymorphic/typedefs.cc: Likewise. + * testsuite/tr1/4_metaprogramming/composite_type_traits/ + is_union_or_class/is_union_or_class.cc: Add tests. + 2005-03-02 Douglas Gregor - * include/tr1/functional (_Has_result_type): Cleanup. - (_Result_of_impl): Handle member data pointers correctly. - (reference_wrapper): Support invocation. - Move repetition code into new file include/tr1/repeat.h. - * include/tr1/functional_iterate.h (reference_wrapper): Support - invocation. Cleanup long lines. - * include/tr1/ref_wrap_iterate.h (reference_wrapper): Declare - invocation operators. - * include/tr1/repeat.h: Code repetition header. - * include/Makefile.am: Add ref_wrap_iterate.h, repeat.h - * include/Makefile.in: Add ref_wrap_iterate.h, repeat.h - * testsuite/tr1/3_function_objects/reference_wrapper/invoke.cc: - New test of reference_wrapper invocation. - * testsuite/tr1/3_function_objects/reference_wrapper/typedefs.cc: - New test of reference_wrapper typedefs and base classes. - * testsuite/tr1/3_function_objects/result_of.cc: Trivial cleanup - (e-mail address). + * include/tr1/functional (_Has_result_type): Cleanup. + (_Result_of_impl): Handle member data pointers correctly. + (reference_wrapper): Support invocation. + Move repetition code into new file include/tr1/repeat.h. + * include/tr1/functional_iterate.h (reference_wrapper): Support + invocation. Cleanup long lines. + * include/tr1/ref_wrap_iterate.h (reference_wrapper): Declare + invocation operators. + * include/tr1/repeat.h: Code repetition header. + * include/Makefile.am: Add ref_wrap_iterate.h, repeat.h. + * include/Makefile.in: Add ref_wrap_iterate.h, repeat.h. + * testsuite/tr1/3_function_objects/reference_wrapper/invoke.cc: + New test of reference_wrapper invocation. + * testsuite/tr1/3_function_objects/reference_wrapper/typedefs.cc: + New test of reference_wrapper typedefs and base classes. + * testsuite/tr1/3_function_objects/result_of.cc: Trivial cleanup + (e-mail address). 2005-03-02 Douglas Gregor - * include/tr1/function (result_of): New class template. - * include/tr1/functional/iterator.h: Implementation of TR1 - result_of. - * testsuite/tr1/3_function_objects/result_of.cc: New test + * include/tr1/function (result_of): New class template. + * include/tr1/functional/iterator.h: Implementation of TR1 + result_of. + * testsuite/tr1/3_function_objects/result_of.cc: New test 2005-03-01 Vladimir Merzliakov diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits index 240542151e4a..37415881c7a4 100644 --- a/libstdc++-v3/include/tr1/type_traits +++ b/libstdc++-v3/include/tr1/type_traits @@ -285,19 +285,19 @@ namespace tr1 { }; // N.B. Without compiler support we cannot tell union from class types, - // and is_empty doesn't work at all with the former. + // and is_empty and is_polymorphic don't work at all with the former. template::value> struct __is_empty_helper { private: template - struct __ebo_1 { }; + struct __first { }; template - struct __ebo_2 + struct __second : public _Up { }; public: - static const bool __value = sizeof(__ebo_1<_Tp>) == sizeof(__ebo_2<_Tp>); + static const bool __value = sizeof(__first<_Tp>) == sizeof(__second<_Tp>); }; template @@ -309,6 +309,31 @@ namespace tr1 : public integral_constant::__value> { }; + template::value> + struct __is_polymorphic_helper + { + private: + template + struct __first + : public _Up { }; + template + struct __second + : public _Up + { virtual void __dummy(); }; + + public: + static const bool __value = sizeof(__first<_Tp>) == sizeof(__second<_Tp>); + }; + + template + struct __is_polymorphic_helper<_Tp, true> + { static const bool __value = false; }; + + template + struct is_polymorphic + : public integral_constant::__value> + { }; + // Exploit the resolution DR core/337. template::value> struct __is_abstract_helper diff --git a/libstdc++-v3/testsuite/testsuite_tr1.h b/libstdc++-v3/testsuite/testsuite_tr1.h index 3e9fafc434c1..cb93225a08d0 100644 --- a/libstdc++-v3/testsuite/testsuite_tr1.h +++ b/libstdc++-v3/testsuite/testsuite_tr1.h @@ -123,6 +123,11 @@ namespace __gnu_test class AbstractClass { virtual void rotate(int) = 0; }; + class PolymorphicClass + { virtual void rotate(int); }; + + class DerivedPolymorphic : public PolymorphicClass { }; + union UnionType { }; diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_union_or_class/is_union_or_class.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_union_or_class/is_union_or_class.cc index 6027eb973867..073128a00f58 100644 --- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_union_or_class/is_union_or_class.cc +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/composite_type_traits/is_union_or_class/is_union_or_class.cc @@ -36,6 +36,8 @@ void test01() VERIFY( (test_category<__is_union_or_class, DerivedType>(true)) ); VERIFY( (test_category<__is_union_or_class, ConvType>(true)) ); VERIFY( (test_category<__is_union_or_class, AbstractClass>(true)) ); + VERIFY( (test_category<__is_union_or_class, PolymorphicClass>(true)) ); + VERIFY( (test_category<__is_union_or_class, DerivedPolymorphic>(true)) ); // Negative tests. VERIFY( (test_category<__is_union_or_class, void>(false)) ); diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_polymorphic/is_polymorphic.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_polymorphic/is_polymorphic.cc new file mode 100644 index 000000000000..8945310f6399 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_polymorphic/is_polymorphic.cc @@ -0,0 +1,54 @@ +// 2005-03-03 Paolo Carlini +// +// Copyright (C) 2005 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 +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + using std::tr1::is_polymorphic; + using namespace __gnu_test; + + // Positive tests. + VERIFY( (test_category(true)) ); + VERIFY( (test_category(true)) ); + VERIFY( (test_category(true)) ); + VERIFY( (test_category(true)) ); + VERIFY( (test_category(true)) ); + + // Negative tests. + VERIFY( (test_category(false)) ); + VERIFY( (test_category(false)) ); + VERIFY( (test_category(false)) ); + VERIFY( (test_category(false)) ); + VERIFY( (test_category(false)) ); + VERIFY( (test_category(false)) ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_polymorphic/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_polymorphic/typedefs.cc new file mode 100644 index 000000000000..44ef1646fa1e --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_polymorphic/typedefs.cc @@ -0,0 +1,36 @@ +// 2005-03-03 Paolo Carlini +// +// Copyright (C) 2005 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::is_polymorphic 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; +}