From ce5e50454e25423bede36e3f7c71ae44e4a0b570 Mon Sep 17 00:00:00 2001 From: redi Date: Sat, 18 May 2013 15:07:02 +0000 Subject: [PATCH] * include/bits/unique_ptr.h (make_unique): Define. * testsuite/20_util/unique_ptr/creation/single.cc: New. * testsuite/20_util/unique_ptr/creation/array.cc: New. * testsuite/20_util/unique_ptr/creation/array_neg.cc: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199057 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 7 +++ libstdc++-v3/include/bits/unique_ptr.h | 31 +++++++++++++ .../testsuite/20_util/unique_ptr/creation/array.cc | 46 +++++++++++++++++++ .../20_util/unique_ptr/creation/array_neg.cc | 34 ++++++++++++++ .../20_util/unique_ptr/creation/single.cc | 53 ++++++++++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc create mode 100644 libstdc++-v3/testsuite/20_util/unique_ptr/creation/array_neg.cc create mode 100644 libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e22b63e8dee..3fba85c1989 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-05-18 Jonathan Wakely + + * include/bits/unique_ptr.h (make_unique): Define. + * testsuite/20_util/unique_ptr/creation/single.cc: New. + * testsuite/20_util/unique_ptr/creation/array.cc: New. + * testsuite/20_util/unique_ptr/creation/array_neg.cc: New. + 2013-05-15 François Dumont * python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Fix diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 66d73b25c6a..e98b85f7da4 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -607,6 +607,37 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } }; +#if __cplusplus > 201103L + template + struct _MakeUniq + { typedef unique_ptr<_Tp> __single_object; }; + + template + struct _MakeUniq<_Tp[]> + { typedef unique_ptr<_Tp[]> __array; }; + + template + struct _MakeUniq<_Tp[_Bound]> + { struct __invalid_type { }; }; + + /// std::make_unique for single objects + template + typename _MakeUniq<_Tp>::__single_object + make_unique(_Args&&... __args) + { return unique_ptr<_Tp>(new _Tp(std::forward<_Args>(__args)...)); } + + /// std::make_unique for arrays of unknown bound + template + typename _MakeUniq<_Tp>::__array + make_unique(size_t __num) + { return unique_ptr<_Tp>(new typename remove_extent<_Tp>::type[__num]()); } + + /// Disable std::make_unique for arrays of known bound + template + typename _MakeUniq<_Tp>::__invalid_type + make_unique(_Args&&...) = delete; +#endif + // @} group pointer_abstractions _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc new file mode 100644 index 00000000000..8943310004b --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc @@ -0,0 +1,46 @@ +// { dg-options "-std=gnu++1y" } + +// Copyright (C) 2013 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 +// . + +// 20.9.1.4 unique_ptr creation [unique.ptr.create] + +#include +#include + +struct A +{ + A() : b(true) { } + A(int) : b(false) { } + bool b; +}; + +void +test01() +{ + bool test __attribute__((unused)) = true; + + std::unique_ptr a = std::make_unique(3); + VERIFY( a != nullptr ); + VERIFY( a[0].b && a[1].b && a[2].b ); +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array_neg.cc new file mode 100644 index 00000000000..1e556226ebc --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array_neg.cc @@ -0,0 +1,34 @@ +// { dg-options "-std=gnu++1y" } +// { dg-do compile } + +// Copyright (C) 2013 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 +// . + +// 20.9.1.4 unique_ptr creation [unique.ptr.create] + +#include +#include + +struct A { }; + +auto p1 = std::make_unique(); // { dg-error "no matching function" } +auto p2 = std::make_unique(1, 2); // { dg-error "no matching function" } +auto p3 = std::make_unique(); // { dg-error "deleted" } +auto p4 = std::make_unique(1); // { dg-error "deleted" } + +// { dg-prune-output "declared here" } +// { dg-prune-output "no type named" } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc new file mode 100644 index 00000000000..689e849e247 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc @@ -0,0 +1,53 @@ +// { dg-options "-std=gnu++1y" } + +// Copyright (C) 2013 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 +// . + +// 20.9.1.4 unique_ptr creation [unique.ptr.create] + +#include +#include + +struct A +{ + A() : b(false) { } + A(int, double&, char&&, void*) : b(true) { } + bool b; +}; + +void +test01() +{ + bool test __attribute__((unused)) = true; + + int i = 0; + double d = 0; + char c = 0; + std::unique_ptr a = std::make_unique(i, d, std::move(c), nullptr); + VERIFY( a != nullptr ); + VERIFY( a->b ); + + a = std::make_unique(); + VERIFY( a != nullptr ); + VERIFY( !a->b ); +} + +int +main() +{ + test01(); +} -- 2.11.4.GIT