1 | diff -Naur boost_1_47_0/boost/ptr_container/detail/void_ptr_iterator.hpp boost_1_47_0.patched/boost/ptr_container/detail/void_ptr_iterator.hpp
|
---|
2 | --- boost_1_47_0/boost/ptr_container/detail/void_ptr_iterator.hpp 2008-03-22 21:45:55.000000000 +0000
|
---|
3 | +++ boost_1_47_0.patched/boost/ptr_container/detail/void_ptr_iterator.hpp 2011-09-29 13:54:40.315982719 +0100
|
---|
4 | @@ -24,6 +24,7 @@
|
---|
5 | {
|
---|
6 | template
|
---|
7 | <
|
---|
8 | + class C,
|
---|
9 | class VoidIter,
|
---|
10 | class T
|
---|
11 | >
|
---|
12 | @@ -53,8 +54,8 @@
|
---|
13 | //
|
---|
14 | // Remark: passing by value breaks vc7.1
|
---|
15 | //
|
---|
16 | - template< class MutableIterator, class MutableT >
|
---|
17 | - void_ptr_iterator( const void_ptr_iterator<MutableIterator,MutableT>& r )
|
---|
18 | + template< class MutableContainer, class MutableIterator, class MutableT >
|
---|
19 | + void_ptr_iterator( const void_ptr_iterator<MutableContainer,MutableIterator,MutableT>& r )
|
---|
20 | #ifdef BOOST_NO_SFINAE
|
---|
21 | : iter_( VoidIter(const_cast<void**>(&*r.base())) )
|
---|
22 | #else
|
---|
23 | @@ -123,48 +124,48 @@
|
---|
24 |
|
---|
25 | }; // class 'void_ptr_iterator'
|
---|
26 |
|
---|
27 | - template< class VoidIter, class T >
|
---|
28 | - inline void_ptr_iterator<VoidIter,T>
|
---|
29 | - operator+( void_ptr_iterator<VoidIter,T> l,
|
---|
30 | - BOOST_DEDUCED_TYPENAME void_ptr_iterator<VoidIter,T>::difference_type n )
|
---|
31 | + template< class C, class VoidIter, class T >
|
---|
32 | + inline void_ptr_iterator<C,VoidIter,T>
|
---|
33 | + operator+( void_ptr_iterator<C,VoidIter,T> l,
|
---|
34 | + BOOST_DEDUCED_TYPENAME void_ptr_iterator<C,VoidIter,T>::difference_type n )
|
---|
35 | {
|
---|
36 | l += n;
|
---|
37 | return l;
|
---|
38 | }
|
---|
39 |
|
---|
40 | - template< class VoidIter, class T >
|
---|
41 | - inline void_ptr_iterator<VoidIter,T>
|
---|
42 | - operator+( BOOST_DEDUCED_TYPENAME void_ptr_iterator<VoidIter,T>::difference_type n,
|
---|
43 | - void_ptr_iterator<VoidIter,T> r )
|
---|
44 | + template< class C, class VoidIter, class T >
|
---|
45 | + inline void_ptr_iterator<C,VoidIter,T>
|
---|
46 | + operator+( BOOST_DEDUCED_TYPENAME void_ptr_iterator<C,VoidIter,T>::difference_type n,
|
---|
47 | + void_ptr_iterator<C,VoidIter,T> r )
|
---|
48 |
|
---|
49 | {
|
---|
50 | r += n;
|
---|
51 | return r;
|
---|
52 | }
|
---|
53 |
|
---|
54 | - template< class VoidIter, class T >
|
---|
55 | - inline void_ptr_iterator<VoidIter,T>
|
---|
56 | - operator-( void_ptr_iterator<VoidIter,T> l,
|
---|
57 | - BOOST_DEDUCED_TYPENAME void_ptr_iterator<VoidIter,T>::difference_type n )
|
---|
58 | + template< class C, class VoidIter, class T >
|
---|
59 | + inline void_ptr_iterator<C,VoidIter,T>
|
---|
60 | + operator-( void_ptr_iterator<C,VoidIter,T> l,
|
---|
61 | + BOOST_DEDUCED_TYPENAME void_ptr_iterator<C,VoidIter,T>::difference_type n )
|
---|
62 | {
|
---|
63 | l -= n;
|
---|
64 | return l;
|
---|
65 | }
|
---|
66 |
|
---|
67 | - template< class VoidIter, class T >
|
---|
68 | - inline void_ptr_iterator<VoidIter,T>
|
---|
69 | - operator-( BOOST_DEDUCED_TYPENAME void_ptr_iterator<VoidIter,T>::difference_type n,
|
---|
70 | - void_ptr_iterator<VoidIter,T> r )
|
---|
71 | + template< class C, class VoidIter, class T >
|
---|
72 | + inline void_ptr_iterator<C,VoidIter,T>
|
---|
73 | + operator-( BOOST_DEDUCED_TYPENAME void_ptr_iterator<C,VoidIter,T>::difference_type n,
|
---|
74 | + void_ptr_iterator<C,VoidIter,T> r )
|
---|
75 |
|
---|
76 | {
|
---|
77 | r -= n;
|
---|
78 | return r;
|
---|
79 | }
|
---|
80 |
|
---|
81 | - template< class VoidIter, class T, class VoidIterU, class U >
|
---|
82 | - inline BOOST_DEDUCED_TYPENAME void_ptr_iterator<VoidIter,T>::difference_type
|
---|
83 | - operator-( void_ptr_iterator<VoidIter,T> l,
|
---|
84 | - void_ptr_iterator<VoidIterU,U> r )
|
---|
85 | + template< class C, class VoidIter, class T, class VoidIterU, class U >
|
---|
86 | + inline BOOST_DEDUCED_TYPENAME void_ptr_iterator<C,VoidIter,T>::difference_type
|
---|
87 | + operator-( void_ptr_iterator<C,VoidIter,T> l,
|
---|
88 | + void_ptr_iterator<C,VoidIterU,U> r )
|
---|
89 |
|
---|
90 | {
|
---|
91 | return l.base() - r.base();
|
---|
92 | @@ -172,54 +173,54 @@
|
---|
93 |
|
---|
94 |
|
---|
95 |
|
---|
96 | - template< class VoidIterT, class T, class VoidIterU, class U >
|
---|
97 | - inline bool operator==( const void_ptr_iterator<VoidIterT,T>& l,
|
---|
98 | - const void_ptr_iterator<VoidIterU,U>& r )
|
---|
99 | + template< class C, class VoidIterT, class T, class VoidIterU, class U>
|
---|
100 | + inline bool operator==( const void_ptr_iterator<C,VoidIterT,T>& l,
|
---|
101 | + const void_ptr_iterator<C,VoidIterU,U>& r )
|
---|
102 | {
|
---|
103 | return l.base() == r.base();
|
---|
104 | }
|
---|
105 |
|
---|
106 |
|
---|
107 |
|
---|
108 | - template< class VoidIterT, class T, class VoidIterU, class U >
|
---|
109 | - inline bool operator!=( const void_ptr_iterator<VoidIterT,T>& l,
|
---|
110 | - const void_ptr_iterator<VoidIterU,U>& r )
|
---|
111 | + template< class C, class VoidIterT, class T, class VoidIterU, class U >
|
---|
112 | + inline bool operator!=( const void_ptr_iterator<C,VoidIterT,T>& l,
|
---|
113 | + const void_ptr_iterator<C,VoidIterU,U>& r )
|
---|
114 | {
|
---|
115 | return l.base() != r.base();
|
---|
116 | }
|
---|
117 |
|
---|
118 |
|
---|
119 |
|
---|
120 | - template< class VoidIterT, class T, class VoidIterU, class U >
|
---|
121 | - inline bool operator<( const void_ptr_iterator<VoidIterT,T>& l,
|
---|
122 | - const void_ptr_iterator<VoidIterU,U>& r )
|
---|
123 | + template< class C, class VoidIterT, class T, class VoidIterU, class U >
|
---|
124 | + inline bool operator<( const void_ptr_iterator<C,VoidIterT,T>& l,
|
---|
125 | + const void_ptr_iterator<C,VoidIterU,U>& r )
|
---|
126 | {
|
---|
127 | return l.base() < r.base();
|
---|
128 | }
|
---|
129 |
|
---|
130 |
|
---|
131 |
|
---|
132 | - template< class VoidIterT, class T, class VoidIterU, class U >
|
---|
133 | - inline bool operator<=( const void_ptr_iterator<VoidIterT,T>& l,
|
---|
134 | - const void_ptr_iterator<VoidIterU,U>& r )
|
---|
135 | + template< class C, class VoidIterT, class T, class VoidIterU, class U >
|
---|
136 | + inline bool operator<=( const void_ptr_iterator<C,VoidIterT,T>& l,
|
---|
137 | + const void_ptr_iterator<C,VoidIterU,U>& r )
|
---|
138 | {
|
---|
139 | return l.base() <= r.base();
|
---|
140 | }
|
---|
141 |
|
---|
142 |
|
---|
143 |
|
---|
144 | - template< class VoidIterT, class T, class VoidIterU, class U >
|
---|
145 | - inline bool operator>( const void_ptr_iterator<VoidIterT,T>& l,
|
---|
146 | - const void_ptr_iterator<VoidIterU,U>& r )
|
---|
147 | + template< class C, class VoidIterT, class T, class VoidIterU, class U >
|
---|
148 | + inline bool operator>( const void_ptr_iterator<C,VoidIterT,T>& l,
|
---|
149 | + const void_ptr_iterator<C,VoidIterU,U>& r )
|
---|
150 | {
|
---|
151 | return l.base() > r.base();
|
---|
152 | }
|
---|
153 |
|
---|
154 |
|
---|
155 |
|
---|
156 | - template< class VoidIterT, class T, class VoidIterU, class U >
|
---|
157 | - inline bool operator>=( const void_ptr_iterator<VoidIterT,T>& l,
|
---|
158 | - const void_ptr_iterator<VoidIterU,U>& r )
|
---|
159 | + template< class C, class VoidIterT, class T, class VoidIterU, class U >
|
---|
160 | + inline bool operator>=( const void_ptr_iterator<C,VoidIterT,T>& l,
|
---|
161 | + const void_ptr_iterator<C,VoidIterU,U>& r )
|
---|
162 | {
|
---|
163 | return l.base() >= r.base();
|
---|
164 | }
|
---|
165 | diff -Naur boost_1_47_0/boost/ptr_container/ptr_array.hpp boost_1_47_0.patched/boost/ptr_container/ptr_array.hpp
|
---|
166 | --- boost_1_47_0/boost/ptr_container/ptr_array.hpp 2008-06-24 21:37:35.000000000 +0100
|
---|
167 | +++ boost_1_47_0.patched/boost/ptr_container/ptr_array.hpp 2011-09-29 12:48:07.197086584 +0100
|
---|
168 | @@ -55,12 +55,14 @@
|
---|
169 | class CloneAllocator = heap_clone_allocator
|
---|
170 | >
|
---|
171 | class ptr_array : public
|
---|
172 | - ptr_sequence_adapter< T,
|
---|
173 | + ptr_sequence_adapter< ptr_array<T,N,CloneAllocator>,
|
---|
174 | + T,
|
---|
175 | ptr_container_detail::ptr_array_impl<void*,N>,
|
---|
176 | CloneAllocator >
|
---|
177 | {
|
---|
178 | private:
|
---|
179 | - typedef ptr_sequence_adapter< T,
|
---|
180 | + typedef ptr_sequence_adapter< ptr_array<T,N,CloneAllocator>,
|
---|
181 | + T,
|
---|
182 | ptr_container_detail::ptr_array_impl<void*,N>,
|
---|
183 | CloneAllocator >
|
---|
184 | base_class;
|
---|
185 | diff -Naur boost_1_47_0/boost/ptr_container/ptr_circular_buffer.hpp boost_1_47_0.patched/boost/ptr_container/ptr_circular_buffer.hpp
|
---|
186 | --- boost_1_47_0/boost/ptr_container/ptr_circular_buffer.hpp 2009-11-01 11:07:12.000000000 +0000
|
---|
187 | +++ boost_1_47_0.patched/boost/ptr_container/ptr_circular_buffer.hpp 2011-09-29 12:49:25.725084542 +0100
|
---|
188 | @@ -29,11 +29,13 @@
|
---|
189 | class Allocator = std::allocator<void*>
|
---|
190 | >
|
---|
191 | class ptr_circular_buffer : public
|
---|
192 | - ptr_sequence_adapter< T,
|
---|
193 | + ptr_sequence_adapter< ptr_circular_buffer<T,CloneAllocator,Allocator>,
|
---|
194 | + T,
|
---|
195 | boost::circular_buffer<void*,Allocator>,
|
---|
196 | CloneAllocator >
|
---|
197 | {
|
---|
198 | - typedef ptr_sequence_adapter< T,
|
---|
199 | + typedef ptr_sequence_adapter< ptr_circular_buffer<T,CloneAllocator,Allocator>,
|
---|
200 | + T,
|
---|
201 | boost::circular_buffer<void*,Allocator>,
|
---|
202 | CloneAllocator >
|
---|
203 | base_type;
|
---|
204 | diff -Naur boost_1_47_0/boost/ptr_container/ptr_deque.hpp boost_1_47_0.patched/boost/ptr_container/ptr_deque.hpp
|
---|
205 | --- boost_1_47_0/boost/ptr_container/ptr_deque.hpp 2008-06-24 21:37:35.000000000 +0100
|
---|
206 | +++ boost_1_47_0.patched/boost/ptr_container/ptr_deque.hpp 2011-09-29 12:49:56.900083730 +0100
|
---|
207 | @@ -29,11 +29,13 @@
|
---|
208 | class Allocator = std::allocator<void*>
|
---|
209 | >
|
---|
210 | class ptr_deque : public
|
---|
211 | - ptr_sequence_adapter< T,
|
---|
212 | + ptr_sequence_adapter< ptr_deque<T,CloneAllocator,Allocator>,
|
---|
213 | + T,
|
---|
214 | std::deque<void*,Allocator>,
|
---|
215 | CloneAllocator >
|
---|
216 | {
|
---|
217 | - typedef ptr_sequence_adapter< T,
|
---|
218 | + typedef ptr_sequence_adapter< ptr_deque<T,CloneAllocator,Allocator>,
|
---|
219 | + T,
|
---|
220 | std::deque<void*,Allocator>,
|
---|
221 | CloneAllocator >
|
---|
222 | base_class;
|
---|
223 | diff -Naur boost_1_47_0/boost/ptr_container/ptr_list.hpp boost_1_47_0.patched/boost/ptr_container/ptr_list.hpp
|
---|
224 | --- boost_1_47_0/boost/ptr_container/ptr_list.hpp 2008-06-24 21:37:35.000000000 +0100
|
---|
225 | +++ boost_1_47_0.patched/boost/ptr_container/ptr_list.hpp 2011-09-29 12:50:26.300082966 +0100
|
---|
226 | @@ -29,11 +29,13 @@
|
---|
227 | class Allocator = std::allocator<void*>
|
---|
228 | >
|
---|
229 | class ptr_list : public
|
---|
230 | - ptr_sequence_adapter< T,
|
---|
231 | + ptr_sequence_adapter< ptr_list<T,CloneAllocator,Allocator>,
|
---|
232 | + T,
|
---|
233 | std::list<void*,Allocator>,
|
---|
234 | CloneAllocator >
|
---|
235 | {
|
---|
236 | - typedef ptr_sequence_adapter< T,
|
---|
237 | + typedef ptr_sequence_adapter< ptr_list<T,CloneAllocator,Allocator>,
|
---|
238 | + T,
|
---|
239 | std::list<void*,Allocator>,
|
---|
240 | CloneAllocator >
|
---|
241 | base_class;
|
---|
242 | diff -Naur boost_1_47_0/boost/ptr_container/ptr_sequence_adapter.hpp boost_1_47_0.patched/boost/ptr_container/ptr_sequence_adapter.hpp
|
---|
243 | --- boost_1_47_0/boost/ptr_container/ptr_sequence_adapter.hpp 2009-11-01 11:07:12.000000000 +0000
|
---|
244 | +++ boost_1_47_0.patched/boost/ptr_container/ptr_sequence_adapter.hpp 2011-09-29 12:52:58.025079018 +0100
|
---|
245 | @@ -30,6 +30,7 @@
|
---|
246 | {
|
---|
247 | template
|
---|
248 | <
|
---|
249 | + class C,
|
---|
250 | class T,
|
---|
251 | class VoidPtrSeq
|
---|
252 | >
|
---|
253 | @@ -46,11 +47,11 @@
|
---|
254 | typedef U value_type;
|
---|
255 |
|
---|
256 | typedef void_ptr_iterator<
|
---|
257 | - BOOST_DEDUCED_TYPENAME VoidPtrSeq::iterator, U >
|
---|
258 | + C, BOOST_DEDUCED_TYPENAME VoidPtrSeq::iterator, U >
|
---|
259 | iterator;
|
---|
260 |
|
---|
261 | typedef void_ptr_iterator<
|
---|
262 | - BOOST_DEDUCED_TYPENAME VoidPtrSeq::const_iterator, const U >
|
---|
263 | + C, BOOST_DEDUCED_TYPENAME VoidPtrSeq::const_iterator, const U >
|
---|
264 | const_iterator;
|
---|
265 |
|
---|
266 | #if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
|
---|
267 | @@ -63,7 +64,7 @@
|
---|
268 |
|
---|
269 | #else
|
---|
270 | template< class Iter >
|
---|
271 | - static U* get_pointer( void_ptr_iterator<Iter,U> i )
|
---|
272 | + static U* get_pointer( void_ptr_iterator<C,Iter,U> i )
|
---|
273 | {
|
---|
274 | return static_cast<U*>( *i.base() );
|
---|
275 | }
|
---|
276 | @@ -87,13 +88,13 @@
|
---|
277 |
|
---|
278 | #if BOOST_WORKAROUND(__MWERKS__, <= 0x3003)
|
---|
279 | template< class Iter >
|
---|
280 | - static const U* get_const_pointer( void_ptr_iterator<Iter,U> i )
|
---|
281 | + static const U* get_const_pointer( void_ptr_iterator<C,Iter,U> i )
|
---|
282 | {
|
---|
283 | return static_cast<const U*>( *i.base() );
|
---|
284 | }
|
---|
285 | #else // BOOST_WORKAROUND
|
---|
286 | template< class Iter >
|
---|
287 | - static const U* get_const_pointer( void_ptr_iterator<Iter,const U> i )
|
---|
288 | + static const U* get_const_pointer( void_ptr_iterator<C,Iter,const U> i )
|
---|
289 | {
|
---|
290 | return static_cast<const U*>( *i.base() );
|
---|
291 | }
|
---|
292 | @@ -112,8 +113,8 @@
|
---|
293 | } // ptr_container_detail
|
---|
294 |
|
---|
295 |
|
---|
296 | - template< class Iterator, class T >
|
---|
297 | - inline bool is_null( void_ptr_iterator<Iterator,T> i )
|
---|
298 | + template< class C, class Iterator, class T >
|
---|
299 | + inline bool is_null( void_ptr_iterator<C,Iterator,T> i )
|
---|
300 | {
|
---|
301 | return *i.base() == 0;
|
---|
302 | }
|
---|
303 | @@ -122,15 +123,16 @@
|
---|
304 |
|
---|
305 | template
|
---|
306 | <
|
---|
307 | + class C,
|
---|
308 | class T,
|
---|
309 | class VoidPtrSeq,
|
---|
310 | class CloneAllocator = heap_clone_allocator
|
---|
311 | >
|
---|
312 | class ptr_sequence_adapter : public
|
---|
313 | - ptr_container_detail::reversible_ptr_container< ptr_container_detail::sequence_config<T,VoidPtrSeq>,
|
---|
314 | + ptr_container_detail::reversible_ptr_container< ptr_container_detail::sequence_config<C,T,VoidPtrSeq>,
|
---|
315 | CloneAllocator >
|
---|
316 | {
|
---|
317 | - typedef ptr_container_detail::reversible_ptr_container< ptr_container_detail::sequence_config<T,VoidPtrSeq>,
|
---|
318 | + typedef ptr_container_detail::reversible_ptr_container< ptr_container_detail::sequence_config<C,T,VoidPtrSeq>,
|
---|
319 | CloneAllocator >
|
---|
320 | base_type;
|
---|
321 |
|
---|
322 | diff -Naur boost_1_47_0/boost/ptr_container/ptr_set_adapter.hpp boost_1_47_0.patched/boost/ptr_container/ptr_set_adapter.hpp
|
---|
323 | --- boost_1_47_0/boost/ptr_container/ptr_set_adapter.hpp 2009-04-05 20:55:59.000000000 +0100
|
---|
324 | +++ boost_1_47_0.patched/boost/ptr_container/ptr_set_adapter.hpp 2011-09-29 13:42:37.367001525 +0100
|
---|
325 | @@ -27,6 +27,7 @@
|
---|
326 | {
|
---|
327 | template
|
---|
328 | <
|
---|
329 | + class C,
|
---|
330 | class Key,
|
---|
331 | class VoidPtrSet,
|
---|
332 | bool Ordered
|
---|
333 | @@ -72,14 +73,15 @@
|
---|
334 | container_type;
|
---|
335 |
|
---|
336 | typedef void_ptr_iterator<
|
---|
337 | - BOOST_DEDUCED_TYPENAME VoidPtrSet::iterator, Key >
|
---|
338 | + C, BOOST_DEDUCED_TYPENAME VoidPtrSet::iterator, Key >
|
---|
339 | iterator;
|
---|
340 |
|
---|
341 | typedef void_ptr_iterator<
|
---|
342 | - BOOST_DEDUCED_TYPENAME VoidPtrSet::const_iterator, const Key >
|
---|
343 | + C, BOOST_DEDUCED_TYPENAME VoidPtrSet::const_iterator, const Key >
|
---|
344 | const_iterator;
|
---|
345 |
|
---|
346 | typedef void_ptr_iterator<
|
---|
347 | + C,
|
---|
348 | BOOST_DEDUCED_TYPENAME
|
---|
349 | mpl::eval_if_c<Ordered,
|
---|
350 | select_iterator<VoidPtrSet>,
|
---|
351 | @@ -88,6 +90,7 @@
|
---|
352 | local_iterator;
|
---|
353 |
|
---|
354 | typedef void_ptr_iterator<
|
---|
355 | + C,
|
---|
356 | BOOST_DEDUCED_TYPENAME
|
---|
357 | mpl::eval_if_c<Ordered,
|
---|
358 | select_iterator<VoidPtrSet>,
|
---|
359 | @@ -114,16 +117,17 @@
|
---|
360 |
|
---|
361 | template
|
---|
362 | <
|
---|
363 | + class C,
|
---|
364 | class Key,
|
---|
365 | class VoidPtrSet,
|
---|
366 | class CloneAllocator = heap_clone_allocator,
|
---|
367 | bool Ordered = true
|
---|
368 | >
|
---|
369 | class ptr_set_adapter_base
|
---|
370 | - : public ptr_container_detail::associative_ptr_container< set_config<Key,VoidPtrSet,Ordered>,
|
---|
371 | + : public ptr_container_detail::associative_ptr_container< set_config<C,Key,VoidPtrSet,Ordered>,
|
---|
372 | CloneAllocator >
|
---|
373 | {
|
---|
374 | - typedef ptr_container_detail::associative_ptr_container< set_config<Key,VoidPtrSet,Ordered>,
|
---|
375 | + typedef ptr_container_detail::associative_ptr_container< set_config<C,Key,VoidPtrSet,Ordered>,
|
---|
376 | CloneAllocator >
|
---|
377 | base_type;
|
---|
378 | public:
|
---|
379 | @@ -173,8 +177,8 @@
|
---|
380 | : base_type( first, last, hash, pred, a )
|
---|
381 | { }
|
---|
382 |
|
---|
383 | - template< class U, class Set, class CA, bool b >
|
---|
384 | - ptr_set_adapter_base( const ptr_set_adapter_base<U,Set,CA,b>& r )
|
---|
385 | + template< class C2, class U, class Set, class CA, bool b >
|
---|
386 | + ptr_set_adapter_base( const ptr_set_adapter_base<C2,U,Set,CA,b>& r )
|
---|
387 | : base_type( r )
|
---|
388 | { }
|
---|
389 |
|
---|
390 | @@ -291,15 +295,16 @@
|
---|
391 |
|
---|
392 | template
|
---|
393 | <
|
---|
394 | + class C,
|
---|
395 | class Key,
|
---|
396 | class VoidPtrSet,
|
---|
397 | class CloneAllocator = heap_clone_allocator,
|
---|
398 | bool Ordered = true
|
---|
399 | >
|
---|
400 | class ptr_set_adapter :
|
---|
401 | - public ptr_container_detail::ptr_set_adapter_base<Key,VoidPtrSet,CloneAllocator,Ordered>
|
---|
402 | + public ptr_container_detail::ptr_set_adapter_base<C,Key,VoidPtrSet,CloneAllocator,Ordered>
|
---|
403 | {
|
---|
404 | - typedef ptr_container_detail::ptr_set_adapter_base<Key,VoidPtrSet,CloneAllocator,Ordered>
|
---|
405 | + typedef ptr_container_detail::ptr_set_adapter_base<C,Key,VoidPtrSet,CloneAllocator,Ordered>
|
---|
406 | base_type;
|
---|
407 |
|
---|
408 | public: // typedefs
|
---|
409 | @@ -380,8 +385,8 @@
|
---|
410 | : base_type( r )
|
---|
411 | { }
|
---|
412 |
|
---|
413 | - template< class U, class Set, class CA, bool b >
|
---|
414 | - explicit ptr_set_adapter( const ptr_set_adapter<U,Set,CA,b>& r )
|
---|
415 | + template< class C2, class U, class Set, class CA, bool b >
|
---|
416 | + explicit ptr_set_adapter( const ptr_set_adapter<C2,U,Set,CA,b>& r )
|
---|
417 | : base_type( r )
|
---|
418 | { }
|
---|
419 |
|
---|
420 | @@ -390,8 +395,8 @@
|
---|
421 | : base_type( clone )
|
---|
422 | { }
|
---|
423 |
|
---|
424 | - template< class U, class Set, class CA, bool b >
|
---|
425 | - ptr_set_adapter& operator=( const ptr_set_adapter<U,Set,CA,b>& r )
|
---|
426 | + template< class C2, class U, class Set, class CA, bool b >
|
---|
427 | + ptr_set_adapter& operator=( const ptr_set_adapter<C2,U,Set,CA,b>& r )
|
---|
428 | {
|
---|
429 | base_type::operator=( r );
|
---|
430 | return *this;
|
---|
431 | @@ -503,15 +508,16 @@
|
---|
432 |
|
---|
433 | template
|
---|
434 | <
|
---|
435 | + class C,
|
---|
436 | class Key,
|
---|
437 | class VoidPtrMultiSet,
|
---|
438 | class CloneAllocator = heap_clone_allocator,
|
---|
439 | bool Ordered = true
|
---|
440 | >
|
---|
441 | class ptr_multiset_adapter :
|
---|
442 | - public ptr_container_detail::ptr_set_adapter_base<Key,VoidPtrMultiSet,CloneAllocator,Ordered>
|
---|
443 | + public ptr_container_detail::ptr_set_adapter_base<C,Key,VoidPtrMultiSet,CloneAllocator,Ordered>
|
---|
444 | {
|
---|
445 | - typedef ptr_container_detail::ptr_set_adapter_base<Key,VoidPtrMultiSet,CloneAllocator,Ordered> base_type;
|
---|
446 | + typedef ptr_container_detail::ptr_set_adapter_base<C,Key,VoidPtrMultiSet,CloneAllocator,Ordered> base_type;
|
---|
447 |
|
---|
448 | public: // typedefs
|
---|
449 |
|
---|
450 | @@ -580,8 +586,8 @@
|
---|
451 | : base_type( first, last, hash, pred, a )
|
---|
452 | { }
|
---|
453 |
|
---|
454 | - template< class U, class Set, class CA, bool b >
|
---|
455 | - explicit ptr_multiset_adapter( const ptr_multiset_adapter<U,Set,CA,b>& r )
|
---|
456 | + template< class C2, class U, class Set, class CA, bool b >
|
---|
457 | + explicit ptr_multiset_adapter( const ptr_multiset_adapter<C2,U,Set,CA,b>& r )
|
---|
458 | : base_type( r )
|
---|
459 | { }
|
---|
460 |
|
---|
461 | @@ -590,8 +596,8 @@
|
---|
462 | : base_type( clone )
|
---|
463 | { }
|
---|
464 |
|
---|
465 | - template< class U, class Set, class CA, bool b >
|
---|
466 | - ptr_multiset_adapter& operator=( const ptr_multiset_adapter<U,Set,CA,b>& r )
|
---|
467 | + template< class C2, class U, class Set, class CA, bool b >
|
---|
468 | + ptr_multiset_adapter& operator=( const ptr_multiset_adapter<C2,U,Set,CA,b>& r )
|
---|
469 | {
|
---|
470 | base_type::operator=( r );
|
---|
471 | return *this;
|
---|
472 | diff -Naur boost_1_47_0/boost/ptr_container/.ptr_set_adapter.hpp.swp boost_1_47_0.patched/boost/ptr_container/.ptr_set_adapter.hpp.swp
|
---|
473 | --- boost_1_47_0/boost/ptr_container/.ptr_set_adapter.hpp.swp 1970-01-01 01:00:00.000000000 +0100
|
---|
474 | +++ boost_1_47_0.patched/boost/ptr_container/.ptr_set_adapter.hpp.swp 2011-09-29 13:42:41.422001417 +0100
|
---|
475 | @@ -0,0 +1,62 @@
|
---|
476 | +b0VIM 7.3½gNÓ4robdlocalhost.localdomain~robd/bits/boost_1_47_0.patched/boost/ptr_container/ptr_set_adapter.hpputf-8
|
---|
477 | 3210#"! Utp
|
---|
478 | +{:|%· 5Û
|
---|
479 | +^!n |
---|
480 | E`Ôh3ad{ýâß\!÷ô®«ªzJI |
---|
481 | Ã |
---|