Commit 0569d07d by Jonathan Wakely

re PR libstdc++/48398 ([C++0x] std::unique_ptr<T, D> is broken when D::pointer is not T*)

2011-04-02  Jonathan Wakely  <redi@gcc.gnu.org>

	PR libstdc++/48398
	* include/bits/unique_ptr.h (__tuple_type): Store pointer type.
	* testsuite/20_util/unique_ptr/modifiers/48398.cc: New.
	* testsuite/20_util/unique_ptr/requirements/pointer_type.cc: Remove
	unused parameter name.

From-SVN: r171894
parent 79455ea1
2011-04-02 Jonathan Wakely <redi@gcc.gnu.org>
PR libstdc++/48398
* include/bits/unique_ptr.h (__tuple_type): Store pointer type.
* testsuite/20_util/unique_ptr/modifiers/48398.cc: New.
* testsuite/20_util/unique_ptr/requirements/pointer_type.cc: Remove
unused parameter name.
2011-03-31 Jeffrey Yasskin <jyasskin@google.com> 2011-03-31 Jeffrey Yasskin <jyasskin@google.com>
* libsupc++/exception_ptr.h: Forward-declare std::type_info. * libsupc++/exception_ptr.h: Forward-declare std::type_info.
......
...@@ -100,11 +100,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -100,11 +100,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef decltype( __test<_Del>(0)) type; typedef decltype( __test<_Del>(0)) type;
}; };
typedef std::tuple<_Tp*, _Dp> __tuple_type; typedef std::tuple<typename _Pointer::type, _Dp> __tuple_type;
__tuple_type _M_t; __tuple_type _M_t;
public: public:
typedef typename _Pointer::type pointer; typedef typename _Pointer::type pointer;
typedef _Tp element_type; typedef _Tp element_type;
typedef _Dp deleter_type; typedef _Dp deleter_type;
......
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// Copyright (C) 2011 Free Software Foundation
//
// 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/>.
// 20.7.1 Class template unique_ptr [unique.ptr]
#include <memory>
// PR libstdc++/48398
struct my_deleter
{
typedef int* pointer;
void operator()( pointer p ) { delete p; }
};
void test01()
{
std::unique_ptr<void, my_deleter> p( new int() );
p.get();
p.reset();
}
// { dg-do compile } // { dg-do compile }
// { dg-options "-std=gnu++0x" } // { dg-options "-std=gnu++0x" }
// Copyright (C) 2010 Free Software Foundation // Copyright (C) 2010, 2011 Free Software Foundation
// //
// 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
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
struct A struct A
{ {
void operator()(void* p) const { } void operator()(void*) const { }
}; };
struct B struct B
{ {
typedef char* pointer; typedef char* pointer;
void operator()(pointer p) const { } void operator()(pointer) const { }
}; };
int main() int main()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment