From 4db7fcb9a806820af731c8f22fafe38701885a19 Mon Sep 17 00:00:00 2001 From: Edward Smith-Rowland <3dw4rd@verizon.net> Date: Wed, 1 Oct 2014 11:59:29 +0000 Subject: [PATCH] type_traits: Add is_final<> type trait for C++14. 2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> * include/std/type_traits: Add is_final<> type trait for C++14. * testsuite/util/testsuite_tr1.h: Add * testsuite/20_util/is_final/requirements/ explicit_instantiation.cc: New. * testsuite/20_util/is_final/requirements/typedefs.cc: New. * testsuite/20_util/is_final/value.cc: New. * testsuite/20_util/declval/requirements/1_neg.cc: Adjust. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Adjust. From-SVN: r215753 --- libstdc++-v3/ChangeLog | 12 +++++++ libstdc++-v3/include/std/type_traits | 9 +++++ .../requirements/explicit_instantiation.cc | 29 +++++++++++++++ .../20_util/is_final/requirements/typedefs.cc | 34 ++++++++++++++++++ .../testsuite/20_util/is_final/value.cc | 35 +++++++++++++++++++ libstdc++-v3/testsuite/util/testsuite_tr1.h | 4 +++ 6 files changed, 123 insertions(+) create mode 100644 libstdc++-v3/testsuite/20_util/is_final/requirements/explicit_instantiation.cc create mode 100644 libstdc++-v3/testsuite/20_util/is_final/requirements/typedefs.cc create mode 100644 libstdc++-v3/testsuite/20_util/is_final/value.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 78609faf691..02ffb3e93c9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> + + * include/std/type_traits: Add is_final<> type trait for C++14. + * testsuite/util/testsuite_tr1.h: Add + * testsuite/20_util/is_final/requirements/ + explicit_instantiation.cc: New. + * testsuite/20_util/is_final/requirements/typedefs.cc: New. + * testsuite/20_util/is_final/value.cc: New. + * testsuite/20_util/declval/requirements/1_neg.cc: Adjust. + * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust. + * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Adjust. + 2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> Implement SD-6: SG10 Feature Test Recommendations diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 86dd6f98044..66900449b9a 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -639,6 +639,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : public integral_constant { }; +#if __cplusplus >= 201402L +#define __cpp_lib_is_final 201402L + /// is_final + template + struct is_final + : public integral_constant + { }; +#endif + /// is_abstract template struct is_abstract diff --git a/libstdc++-v3/testsuite/20_util/is_final/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/is_final/requirements/explicit_instantiation.cc new file mode 100644 index 00000000000..c5d44e6bcfd --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_final/requirements/explicit_instantiation.cc @@ -0,0 +1,29 @@ +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +// Copyright (C) 2014 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 is_final; +} diff --git a/libstdc++-v3/testsuite/20_util/is_final/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/is_final/requirements/typedefs.cc new file mode 100644 index 00000000000..b07d90becaa --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_final/requirements/typedefs.cc @@ -0,0 +1,34 @@ +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +// Copyright (C) 2014 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 + +void test01() +{ + // Check for required typedefs + typedef std::is_final 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/20_util/is_final/value.cc b/libstdc++-v3/testsuite/20_util/is_final/value.cc new file mode 100644 index 00000000000..281c1ab6d7f --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_final/value.cc @@ -0,0 +1,35 @@ +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +// Copyright (C) 2011-2014 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 + +void test01() +{ + using std::is_final; + using namespace __gnu_test; + + // Positive test. + static_assert(test_category(true), ""); + + // Negative tests. + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); +} diff --git a/libstdc++-v3/testsuite/util/testsuite_tr1.h b/libstdc++-v3/testsuite/util/testsuite_tr1.h index aa80a214617..6e962961b16 100644 --- a/libstdc++-v3/testsuite/util/testsuite_tr1.h +++ b/libstdc++-v3/testsuite/util/testsuite_tr1.h @@ -100,6 +100,10 @@ namespace __gnu_test class DerivedType : public ClassType { }; +#if __cplusplus >= 201103L + class FinalType final : public DerivedType { }; +#endif + enum EnumType { e0 }; struct ConvType -- 2.30.2