OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/46718 ([c++0x] nullptr_t must be scalar) 

2010-11-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/46718
	* include/std/type_traits (__is_nullptr_t): Add.
	(is_scalar): Use the latter.
	* testsuite/20_util/is_scalar/value.cc: New.
	* testsuite/20_util/is_scalar/requirements/typedefs.cc: Likewise.
	* testsuite/20_util/is_scalar/requirements/explicit_instantiation.cc:
	Likewise.
	* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
	Adjust dg-error line numbers.
	* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
	Likewise.
	* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.

From-SVN: r167294
This commit is contained in:
Paolo Carlini 2010-11-30 12:52:38 +00:00 committed by Paolo Carlini
parent 7c475d1159
commit 1e6734153b
8 changed files with 147 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,18 @@
2010-11-30 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/46718
* include/std/type_traits (__is_nullptr_t): Add.
(is_scalar): Use the latter.
* testsuite/20_util/is_scalar/value.cc: New.
* testsuite/20_util/is_scalar/requirements/typedefs.cc: Likewise.
* testsuite/20_util/is_scalar/requirements/explicit_instantiation.cc:
Likewise.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
2010-11-28 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/46689

15
libstdc++-v3/include/std/type_traits
View File

@ -250,6 +250,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
struct is_function<_Res(_ArgTypes......) const volatile>
: public true_type { };
template<typename>
struct __is_nullptr_t_helper
: public false_type { };
_DEFINE_SPEC(0, __is_nullptr_t_helper, std::nullptr_t, true)
// __is_nullptr_t (extension).
template<typename _Tp>
struct __is_nullptr_t
: public integral_constant<bool, (__is_nullptr_t_helper<typename
remove_cv<_Tp>::type>::value)>
{ };
// composite type traits.
/// is_arithmetic
@ -284,7 +296,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
: public integral_constant<bool, (is_arithmetic<_Tp>::value
|| is_enum<_Tp>::value
|| is_pointer<_Tp>::value
|| is_member_pointer<_Tp>::value)>
|| is_member_pointer<_Tp>::value
|| __is_nullptr_t<_Tp>::value)>
{ };
/// is_compound

2
libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
View File

@ -19,7 +19,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-error "static assertion failed" "" { target *-*-* } 1119 }
// { dg-error "static assertion failed" "" { target *-*-* } 1132 }
#include <utility>

29
libstdc++-v3/testsuite/20_util/is_scalar/requirements/explicit_instantiation.cc Normal file
View File

@ -0,0 +1,29 @@
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// 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
// <http://www.gnu.org/licenses/>.
// NB: This file is for testing type_traits with NO OTHER INCLUDES.
#include <type_traits>
namespace std
{
typedef short test_type;
template struct is_scalar<test_type>;
}

36
libstdc++-v3/testsuite/20_util/is_scalar/requirements/typedefs.cc Normal file
View File

@ -0,0 +1,36 @@
// 2010-11-30 Paolo Carlini <paolo.carlini@oracle.com>
//
// 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
// <http://www.gnu.org/licenses/>.
//
// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES.
#include <type_traits>
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
void test01()
{
// Check for required typedefs
typedef std::is_scalar<int> 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;
}

48
libstdc++-v3/testsuite/20_util/is_scalar/value.cc Normal file
View File

@ -0,0 +1,48 @@
// { dg-options "-std=gnu++0x" }
// 2010-11-30 Paolo Carlini <paolo.carlini@oracle.com>
//
// 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
// <http://www.gnu.org/licenses/>.
#include <type_traits>
#include <testsuite_hooks.h>
#include <testsuite_tr1.h>
void test01()
{
bool test __attribute__((unused)) = true;
using std::is_scalar;
using namespace __gnu_test;
VERIFY( (test_category<is_scalar, int>(true)) );
VERIFY( (test_category<is_scalar, float>(true)) );
VERIFY( (test_category<is_scalar, EnumType>(true)) );
VERIFY( (test_category<is_scalar, int*>(true)) );
VERIFY( (test_category<is_scalar, int(*)(int)>(true)) );
VERIFY( (test_category<is_scalar, int (ClassType::*)>(true)) );
VERIFY( (test_category<is_scalar, int (ClassType::*) (int)>(true)) );
VERIFY( (test_category<is_scalar, std::nullptr_t>(true)) );
// Sanity check.
VERIFY( (test_category<is_scalar, ClassType>(false)) );
}
int main()
{
test01();
return 0;
}

4
libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
View File

@ -48,5 +48,5 @@ void test01()
// { dg-error "instantiated from here" "" { target *-*-* } 40 }
// { dg-error "instantiated from here" "" { target *-*-* } 42 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1082 }
// { dg-error "declaration of" "" { target *-*-* } 1046 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1095 }
// { dg-error "declaration of" "" { target *-*-* } 1059 }

4
libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
View File

@ -48,5 +48,5 @@ void test01()
// { dg-error "instantiated from here" "" { target *-*-* } 40 }
// { dg-error "instantiated from here" "" { target *-*-* } 42 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1005 }
// { dg-error "declaration of" "" { target *-*-* } 969 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1018 }
// { dg-error "declaration of" "" { target *-*-* } 982 }