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
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
--- /usr/include/boost/smart_ptr/shared_ptr.hpp.orig 2016-01-15 11:54:21.423304649 -0500
+++ /usr/include/boost/smart_ptr/shared_ptr.hpp 2016-01-15 12:27:20.324047643 -0500
@@ -52,6 +52,13 @@
#endif
#endif
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+void boost_debug_shared_ptr_operator_equals (void const *, void const *, int, void const*, int);
+void boost_debug_shared_ptr_reset (void const *, void const *, int, void const*, int);
+void boost_debug_shared_ptr_destructor (void const *, void const *, int);
+void boost_debug_shared_ptr_constructor (void const *, void const *, int);
+#endif
+
namespace boost
{
@@ -275,20 +282,29 @@
{
boost::detail::shared_count( p ).swap( pn );
boost::detail::sp_enable_shared_from_this( ppx, p, p );
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_constructor (ppx, ppx->get(), ppx->use_count());
+#endif
}
#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-template< class T, class Y > inline void sp_pointer_construct( boost::shared_ptr< T[] > * /*ppx*/, Y * p, boost::detail::shared_count & pn )
+template< class T, class Y > inline void sp_pointer_construct( boost::shared_ptr< T[] > * ppx, Y * p, boost::detail::shared_count & pn )
{
sp_assert_convertible< Y[], T[] >();
boost::detail::shared_count( p, boost::checked_array_deleter< T >() ).swap( pn );
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ /* no code for this yet - shared_ptr to array of T */
+#endif
}
template< class T, std::size_t N, class Y > inline void sp_pointer_construct( boost::shared_ptr< T[N] > * /*ppx*/, Y * p, boost::detail::shared_count & pn )
{
sp_assert_convertible< Y[N], T[N] >();
boost::detail::shared_count( p, boost::checked_array_deleter< T >() ).swap( pn );
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ /* no code for this yet - shared_ptr to array of T */
+#endif
}
#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
@@ -298,6 +314,9 @@
template< class T, class Y > inline void sp_deleter_construct( boost::shared_ptr< T > * ppx, Y * p )
{
boost::detail::sp_enable_shared_from_this( ppx, p, p );
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_constructor (ppx, ppx->get(), ppx->use_count());
+#endif
}
#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
@@ -305,11 +324,17 @@
template< class T, class Y > inline void sp_deleter_construct( boost::shared_ptr< T[] > * /*ppx*/, Y * /*p*/ )
{
sp_assert_convertible< Y[], T[] >();
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ /* no code for this yet - shared_ptr to array of T */
+#endif
}
template< class T, std::size_t N, class Y > inline void sp_deleter_construct( boost::shared_ptr< T[N] > * /*ppx*/, Y * /*p*/ )
{
sp_assert_convertible< Y[N], T[N] >();
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ /* no code for this yet - shared_ptr to array of T */
+#endif
}
#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
@@ -338,12 +363,20 @@
shared_ptr() BOOST_NOEXCEPT : px( 0 ), pn() // never throws in 1.30+
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ /* default constructor case */
+ boost_debug_shared_ptr_constructor (this, px, use_count());
+#endif
}
#if !defined( BOOST_NO_CXX11_NULLPTR )
shared_ptr( boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT : px( 0 ), pn() // never throws
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ /* explicit nullptr constructor case */
+ boost_debug_shared_ptr_constructor (this, px, use_count());
+#endif
}
#endif
@@ -384,11 +417,23 @@
template<class D, class A> shared_ptr( boost::detail::sp_nullptr_t p, D d, A a ): px( p ), pn( p, d, a )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_constructor (this, px, use_count());
+#endif
}
#endif
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ ~shared_ptr() {
+ boost_debug_shared_ptr_destructor (this, get(), use_count());
+ }
+ shared_ptr(const shared_ptr<T>& r ) : px (r.px), pn (r.pn) {
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+ }
+#else
// generated copy constructor, destructor are fine...
+#endif /* BOOST_SP_ENABLE_DEBUG_HOOKS */
#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
@@ -396,6 +441,9 @@
shared_ptr( shared_ptr const & r ) BOOST_NOEXCEPT : px( r.px ), pn( r.pn )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
}
#endif
@@ -405,6 +453,9 @@
{
boost::detail::sp_assert_convertible< Y, T >();
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.px, -1);
+#endif
// it is now safe to copy r.px, as pn(r.pn) did not throw
px = r.px;
}
@@ -415,6 +466,9 @@
{
if( !pn.empty() )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.px, -1);
+#endif
px = r.px;
}
}
@@ -432,6 +486,9 @@
BOOST_NOEXCEPT : px( r.px ), pn( r.pn )
{
boost::detail::sp_assert_convertible< Y, T >();
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
}
// aliasing
@@ -513,6 +570,9 @@
template<class Y>
shared_ptr & operator=(shared_ptr<Y> const & r) BOOST_NOEXCEPT
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
this_type(r).swap(*this);
return *this;
}
@@ -524,6 +584,9 @@
template<class Y>
shared_ptr & operator=( std::auto_ptr<Y> & r )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
this_type( r ).swap( *this );
return *this;
}
@@ -533,6 +596,9 @@
template<class Y>
shared_ptr & operator=( std::auto_ptr<Y> && r )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
this_type( static_cast< std::auto_ptr<Y> && >( r ) ).swap( *this );
return *this;
}
@@ -555,6 +621,9 @@
template<class Y, class D>
shared_ptr & operator=( std::unique_ptr<Y, D> && r )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
this_type( static_cast< std::unique_ptr<Y, D> && >( r ) ).swap(*this);
return *this;
}
@@ -567,6 +636,9 @@
shared_ptr( shared_ptr && r ) BOOST_NOEXCEPT : px( r.px ), pn()
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
pn.swap( r.pn );
r.px = 0;
}
@@ -585,12 +657,18 @@
{
boost::detail::sp_assert_convertible< Y, T >();
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
pn.swap( r.pn );
r.px = 0;
}
shared_ptr & operator=( shared_ptr && r ) BOOST_NOEXCEPT
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
this_type( static_cast< shared_ptr && >( r ) ).swap( *this );
return *this;
}
@@ -598,6 +676,9 @@
template<class Y>
shared_ptr & operator=( shared_ptr<Y> && r ) BOOST_NOEXCEPT
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
this_type( static_cast< shared_ptr<Y> && >( r ) ).swap( *this );
return *this;
}
@@ -608,6 +689,9 @@
shared_ptr & operator=( boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT // never throws
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_operator_equals (this, get(), use_count(), r.get(), r.use_count());
+#endif
this_type().swap(*this);
return *this;
}
@@ -616,27 +700,42 @@
void reset() BOOST_NOEXCEPT // never throws in 1.30+
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_reset (this, get(), use_count(), 0, 0);
+#endif
this_type().swap(*this);
}
template<class Y> void reset( Y * p ) // Y must be complete
{
BOOST_ASSERT( p == 0 || p != px ); // catch self-reset errors
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_reset (this, get(), use_count(), p, 0);
+#endif
this_type( p ).swap( *this );
}
template<class Y, class D> void reset( Y * p, D d )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_reset (this, get(), use_count(), p, 0);
+#endif
this_type( p, d ).swap( *this );
}
template<class Y, class D, class A> void reset( Y * p, D d, A a )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_reset (this, get(), use_count(), p, 0);
+#endif
this_type( p, d, a ).swap( *this );
}
template<class Y> void reset( shared_ptr<Y> const & r, element_type * p )
{
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+ boost_debug_shared_ptr_reset (this, get(), use_count(), p, 0);
+#endif
this_type( r, p ).swap( *this );
}
|
