mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-13 07:30:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jonathan Wakely 2011-04-02 20:32:15 +01:00
parent 79455ea1f8
commit 0569d07d16
4 changed files with 55 additions and 6 deletions
libstdc++-v3
ChangeLog
include/bits
unique_ptr.h
testsuite/20_util/unique_ptr
modifiers
48398.cc
requirements
pointer_type.cc

8
libstdc++-v3/ChangeLog

@ -1,3 +1,11 @@
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>
* libsupc++/exception_ptr.h: Forward-declare std::type_info.

6
libstdc++-v3/include/bits/unique_ptr.h

@ -100,11 +100,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef decltype( __test<_Del>(0)) type;
};
typedef std::tuple<_Tp*, _Dp> __tuple_type;
__tuple_type _M_t;
typedef std::tuple<typename _Pointer::type, _Dp> __tuple_type;
__tuple_type _M_t;
public:
typedef typename _Pointer::type pointer;
typedef typename _Pointer::type pointer;
typedef _Tp element_type;
typedef _Dp deleter_type;

41
libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/48398.cc Normal file

@ -0,0 +1,41 @@
// { 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();
}

6
libstdc++-v3/testsuite/20_util/unique_ptr/requirements/pointer_type.cc

@ -1,7 +1,7 @@
// { dg-do compile }
// { 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
// software; you can redistribute it and/or modify it under the
@ -25,13 +25,13 @@
struct A
{
void operator()(void* p) const { }
void operator()(void*) const { }
};
struct B
{
typedef char* pointer;
void operator()(pointer p) const { }
void operator()(pointer) const { }
};
int main()