FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unique_ptr.h (default_delete<>::default_delete()): Declare defaulted per DR 1517.

Browse source 
2011-01-18  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/unique_ptr.h (default_delete<>::default_delete()):
	Declare defaulted per DR 1517.
	* testsuite/util/testsuite_common_types.h
	(constexpr_defaulted_default_constructible): Add.
	* testsuite/20_util/default_delete/cons/constexpr.cc: Use it.

From-SVN: r168947
This commit is contained in:
Paolo Carlini 2011-01-18 11:12:06 +00:00 • committed by Paolo Carlini
parent e7ef91dc8e
commit d326f2eeb7
4 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,11 @@
2011-01-18 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/unique_ptr.h (default_delete<>::default_delete()):
Declare defaulted per DR 1517.
* testsuite/util/testsuite_common_types.h
(constexpr_defaulted_default_constructible): Add.
* testsuite/20_util/default_delete/cons/constexpr.cc: Use it.
2011-01-17 Paolo Carlini <paolo.carlini@oracle.com> 2011-01-17 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_queue.h (queue<>::swap, priority_queue<>::swap): * include/bits/stl_queue.h (queue<>::swap, priority_queue<>::swap):

4
libstdc++-v3/include/bits/unique_ptr.h
View file

@ -47,7 +47,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename _Tp> template<typename _Tp>
struct default_delete struct default_delete
{ {
constexpr default_delete() { } constexpr default_delete() = default;
template<typename _Up, typename = typename template<typename _Up, typename = typename
std::enable_if<std::is_convertible<_Up*, _Tp*>::value>::type> std::enable_if<std::is_convertible<_Up*, _Tp*>::value>::type>
@ -68,7 +68,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename _Tp> template<typename _Tp>
struct default_delete<_Tp[]> struct default_delete<_Tp[]>
{ {
constexpr default_delete() { } constexpr default_delete() = default;
void void
operator()(_Tp* __ptr) const operator()(_Tp* __ptr) const

2
libstdc++-v3/testsuite/20_util/default_delete/cons/constexpr.cc
View file

@ -23,7 +23,7 @@
int main() int main()
{ {
__gnu_test::constexpr_default_constructible test; __gnu_test::constexpr_defaulted_default_constructible test;
test.operator()<std::default_delete<int>>(); test.operator()<std::default_delete<int>>();
return 0; return 0;
} }

20
libstdc++-v3/testsuite/util/testsuite_common_types.h
View file

@ -644,7 +644,7 @@ namespace __gnu_test
template<typename _Tp, bool _IsLitp = std::is_literal_type<_Tp>::value> template<typename _Tp, bool _IsLitp = std::is_literal_type<_Tp>::value>
struct _Concept; struct _Concept;
// NB: _Tp must be a literal type. // NB: _Tp must be a literal type.
// Have to have user-defined default ctor for this to work. // Have to have user-defined default ctor for this to work.
template<typename _Tp> template<typename _Tp>
struct _Concept<_Tp, true> struct _Concept<_Tp, true>
@ -671,6 +671,24 @@ namespace __gnu_test
} }
}; };
// Generator to test defaulted default constructor.
struct constexpr_defaulted_default_constructible
{
template<typename _Tp>
void
operator()()
{
struct _Concept
{
void __constraint()
{ constexpr _Tp __v __attribute__((unused)) { }; }
};
void (_Concept::*__x)() __attribute__((unused))
= &_Concept::__constraint;
}
};
struct constexpr_single_value_constructible struct constexpr_single_value_constructible
{ {
template<typename _Ttesttype, typename _Tvaluetype, template<typename _Ttesttype, typename _Tvaluetype,