mirror of git://gcc.gnu.org/git/gcc.git
type_traits (__is_function_helper): New, uses variadic templates.
2007-04-10 Paolo Carlini <pcarlini@suse.de> * include/tr1/type_traits (__is_function_helper): New, uses variadic templates. (is_function): Forward to the latter. * testsuite/tr1/4_metaprogramming/primary_type_categories/ is_function/is_function.cc: Add test. From-SVN: r123695
This commit is contained in:
parent
0218c0120c
commit
05beb8e720
|
|
@ -1,3 +1,11 @@
|
||||||
|
2007-04-10 Paolo Carlini <pcarlini@suse.de>
|
||||||
|
|
||||||
|
* include/tr1/type_traits (__is_function_helper): New, uses
|
||||||
|
variadic templates.
|
||||||
|
(is_function): Forward to the latter.
|
||||||
|
* testsuite/tr1/4_metaprogramming/primary_type_categories/
|
||||||
|
is_function/is_function.cc: Add test.
|
||||||
|
|
||||||
2007-04-10 Paolo Carlini <pcarlini@suse.de>
|
2007-04-10 Paolo Carlini <pcarlini@suse.de>
|
||||||
|
|
||||||
PR libstdc++/28277 (partial: vstring bits)
|
PR libstdc++/28277 (partial: vstring bits)
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,8 @@
|
||||||
#ifndef _TR1_TYPE_TRAITS
|
#ifndef _TR1_TYPE_TRAITS
|
||||||
#define _TR1_TYPE_TRAITS 1
|
#define _TR1_TYPE_TRAITS 1
|
||||||
|
|
||||||
|
#pragma GCC system_header
|
||||||
|
|
||||||
#include <bits/c++config.h>
|
#include <bits/c++config.h>
|
||||||
#include <tr1/type_traits_fwd.h>
|
#include <tr1/type_traits_fwd.h>
|
||||||
|
|
||||||
|
|
@ -171,14 +173,22 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
|
||||||
: public integral_constant<bool, __is_class(_Tp)>
|
: public integral_constant<bool, __is_class(_Tp)>
|
||||||
{ };
|
{ };
|
||||||
|
|
||||||
|
template<typename>
|
||||||
|
struct __is_function_helper
|
||||||
|
: public false_type { };
|
||||||
|
|
||||||
|
template<typename _Res, typename... _ArgTypes>
|
||||||
|
struct __is_function_helper<_Res(_ArgTypes...)>
|
||||||
|
: public true_type { };
|
||||||
|
|
||||||
|
template<typename _Res, typename... _ArgTypes>
|
||||||
|
struct __is_function_helper<_Res(_ArgTypes......)>
|
||||||
|
: public true_type { };
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
struct is_function
|
struct is_function
|
||||||
: public integral_constant<bool, !(is_void<_Tp>::value
|
: public integral_constant<bool, (__is_function_helper<typename
|
||||||
|| is_scalar<_Tp>::value
|
remove_cv<_Tp>::type>::value)>
|
||||||
|| is_array<_Tp>::value
|
|
||||||
|| is_reference<_Tp>::value
|
|
||||||
|| is_union<_Tp>::value
|
|
||||||
|| is_class<_Tp>::value)>
|
|
||||||
{ };
|
{ };
|
||||||
|
|
||||||
/// @brief composite type traits [4.5.2].
|
/// @brief composite type traits [4.5.2].
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// 2004-12-16 Paolo Carlini <pcarlini@suse.de>
|
// 2004-12-16 Paolo Carlini <pcarlini@suse.de>
|
||||||
//
|
//
|
||||||
// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
// Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of the GNU ISO C++ Library. This library is free
|
// 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
|
// software; you can redistribute it and/or modify it under the
|
||||||
|
|
@ -34,6 +34,7 @@ void test01()
|
||||||
VERIFY( (test_category<is_function, int (int)>(true)) );
|
VERIFY( (test_category<is_function, int (int)>(true)) );
|
||||||
VERIFY( (test_category<is_function, ClassType (ClassType)>(true)) );
|
VERIFY( (test_category<is_function, ClassType (ClassType)>(true)) );
|
||||||
VERIFY( (test_category<is_function, float (int, float, int[], int&)>(true)) );
|
VERIFY( (test_category<is_function, float (int, float, int[], int&)>(true)) );
|
||||||
|
VERIFY( (test_category<is_function, int (int, ...)>(true)) );
|
||||||
|
|
||||||
// Negative tests.
|
// Negative tests.
|
||||||
VERIFY( (test_category<is_function, int&>(false)) );
|
VERIFY( (test_category<is_function, int&>(false)) );
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue