Bump for 3.6-28
[LibreOffice.git] / boost / boost_1_44_0-gcc4.7.patch
blob842a92a681d666d4edc70a8d54cebe8b6499c6bd
1 --- misc/boost_1_44_0/boost/smart_ptr/shared_ptr.hpp 2009-12-14 18:44:19.000000000 +0100
2 +++ misc/build/boost_1_44_0/boost/smart_ptr/shared_ptr.hpp 2012-03-28 08:32:46.772493003 +0200
3 @@ -207,7 +207,17 @@
4 boost::detail::sp_enable_shared_from_this( this, p, p );
7 -// generated copy constructor, destructor are fine
8 +// generated copy constructor, destructor are fine...
10 +#if defined( BOOST_HAS_RVALUE_REFS )
12 +// ... except in C++0x, move disables the implicit copy
14 + shared_ptr( shared_ptr const & r ): px( r.px ), pn( r.pn ) // never throws
15 + {
16 + }
18 +#endif
20 template<class Y>
21 explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw
22 --- misc/boost_1_44_0/boost/smart_ptr/weak_ptr.hpp 2009-12-14 18:44:19.000000000 +0100
23 +++ misc/build/boost_1_44_0/boost/smart_ptr/weak_ptr.hpp 2012-03-28 10:31:57.607462325 +0200
24 @@ -40,8 +40,24 @@
28 -// generated copy constructor, assignment, destructor are fine
29 +// generated copy constructor, assignment, destructor are fine...
31 +#if defined( BOOST_HAS_RVALUE_REFS )
33 +// ... except in C++0x, move disables the implicit copy
35 + weak_ptr( weak_ptr const & r ): px( r.px ), pn( r.pn ) // never throws
36 + {
37 + }
39 + weak_ptr & operator=( weak_ptr const & r ) // never throws
40 + {
41 + px = r.px;
42 + pn = r.pn;
43 + return *this;
44 + }
46 +#endif
49 // The "obvious" converting constructor implementation: