1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
From 2ce87b6b9c9143a22381eec77bbf1fd7016e132d Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 16 Apr 2011 00:55:53 +0000
Subject: [PATCH 129/200] 2011-04-15 Daniel Krugler <daniel.kruegler@googlemail.com>
Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/48635
* include/bits/unique_ptr.h (unique_ptr<>::operator=(unique_ptr&&),
unique_ptr<>::operator=(unique_ptr<>&&),
unique_ptr<_Tp[],>::operator=(unique_ptr&&),
unique_ptr<_Tp[],>::operator=(unique_ptr<>&&)): Forward the deleter
instead of moving it.
* testsuite/20_util/unique_ptr/assign/48635.cc: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172533 138bc75d-0d04-0410-961f-82ee72b054a4
index 5df4325..1be2e7a 100644
--- a/libstdc++-v3/include/bits/unique_ptr.h
+++ b/libstdc++-v3/include/bits/unique_ptr.h
@@ -171,7 +171,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator=(unique_ptr&& __u)
{
reset(__u.release());
- get_deleter() = std::move(__u.get_deleter());
+ get_deleter() = std::forward<deleter_type>(__u.get_deleter());
return *this;
}
@@ -184,7 +184,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator=(unique_ptr<_Up, _Ep>&& __u)
{
reset(__u.release());
- get_deleter() = std::move(__u.get_deleter());
+ get_deleter() = std::forward<deleter_type>(__u.get_deleter());
return *this;
}
@@ -315,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator=(unique_ptr&& __u)
{
reset(__u.release());
- get_deleter() = std::move(__u.get_deleter());
+ get_deleter() = std::forward<deleter_type>(__u.get_deleter());
return *this;
}
@@ -324,7 +324,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator=(unique_ptr<_Up, _Ep>&& __u)
{
reset(__u.release());
- get_deleter() = std::move(__u.get_deleter());
+ get_deleter() = std::forward<deleter_type>(__u.get_deleter());
return *this;
}
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc
new file mode 100644
index 0000000..99b412b
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc
@@ -0,0 +1,78 @@
+// { 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/>.
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+struct Deleter
+{
+ Deleter() = default;
+ Deleter(const Deleter&) = default;
+ Deleter(Deleter&&) = default;
+
+ Deleter&
+ operator=(const Deleter&)
+ {
+ bool test __attribute__((unused)) = true;
+ VERIFY( true );
+ return *this;
+ }
+
+ Deleter&
+ operator=(Deleter&&)
+ {
+ bool test __attribute__((unused)) = true;
+ VERIFY( false );
+ return *this;
+ }
+
+ template<class T>
+ void
+ operator()(T*) const { }
+};
+
+struct DDeleter : Deleter { };
+
+// libstdc++/48635
+void test01()
+{
+ Deleter d;
+
+ std::unique_ptr<int, Deleter&> p1(nullptr, d), p2(nullptr, d);
+ p2 = std::move(p1);
+
+ DDeleter dd;
+
+ std::unique_ptr<int, DDeleter&> p1t(nullptr, dd);
+ std::unique_ptr<int, Deleter&> p2t(nullptr, d);
+ p2t = std::move(p1t);
+
+ std::unique_ptr<int[], Deleter&> p1a(nullptr, d), p2a(nullptr, d);
+ p2a = std::move(p1a);
+
+ std::unique_ptr<int[], DDeleter&> p1at(nullptr, dd);
+ std::unique_ptr<int[], Deleter&> p2at(nullptr, d);
+ p2at = std::move(p1at);
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
--
1.7.0.4
|
