Peter Dimov
71eb435412
Merged revision(s) 57197, 57206, 57423, 57518 from trunk:
...
Renamed enable_shared_from_this2 to enable_shared_from_raw and
added shared_from_raw free function. These changes fix the pointer
value in shared_ptr which were obtained before an external shared_ptr has
taken ownership of the object (for example when a shared_ptr to
this is obtained in an object's constructor).
........
Brought back code which fixes get_deleter when it is called on a deleter
which has been wrapped inside a deleter_wrapper by "shared_from_raw() in
constructors" support.
........
Added weak_from_raw(), for use in conjunction with
enable_shared_from_raw base class.
........
Fixed access to enable_shared_from_raw::weak_this_ when
BOOST_NO_MEMBER_TEMPLATE_FRIENDS is defined.
........
[SVN r81337]
2012-11-14 13:26:30 +00:00
Peter Dimov
4a2dad1574
Merged [81134] from trunk. Fixes #6308 . Refs #6667 .
...
[SVN r81336]
2012-11-14 12:09:30 +00:00
Peter Dimov
babc72757d
Merged [81131] from trunk. Fixes #6625 .
...
[SVN r81335]
2012-11-14 12:04:48 +00:00
Peter Dimov
c19cbc1892
Merged [81128] from trunk. Fixes #7141 .
...
[SVN r81334]
2012-11-14 11:57:58 +00:00
Peter Dimov
d065e4d971
Merged [81127] from trunk. Fixes #6901 .
...
[SVN r81333]
2012-11-14 11:55:10 +00:00
Peter Dimov
777b86a661
Merged [81126] from trunk. Fixes #6996 .
...
[SVN r81332]
2012-11-14 11:53:05 +00:00
Peter Dimov
aae5440854
Merged [80988] from trunk.
...
[SVN r81331]
2012-11-14 11:51:00 +00:00
Peter Dimov
227d2e3255
Manually apply [69019] from trunk.
...
[SVN r81330]
2012-11-14 11:43:17 +00:00
Peter Dimov
8bf183b373
Merged [81125] from trunk. Fixes #4185 .
...
[SVN r81329]
2012-11-14 11:20:29 +00:00
Peter Dimov
5017da2514
Merged [81119] from trunk. Fixes #7599 .
...
[SVN r81328]
2012-11-14 11:17:48 +00:00
Peter Dimov
c2048732d8
Merge [77316] to release. Closes #6667 .
...
[SVN r77318]
2012-03-12 17:40:02 +00:00
Peter Dimov
5979c1d4bd
Merge [77315] to release. Closes #5331 .
...
[SVN r77317]
2012-03-12 17:37:51 +00:00
Peter Dimov
3090f6f4af
Merge [76219] to release. Fixes #6332 .
...
[SVN r76221]
2011-12-29 22:43:02 +00:00
Peter Dimov
b9970eda45
Merge [76111] to release. Fixes #2603 .
...
[SVN r76163]
2011-12-26 00:23:00 +00:00
Peter Dimov
9147489b4c
Merge [76123] to release. Refs #6308 .
...
[SVN r76124]
2011-12-23 23:12:50 +00:00
Peter Dimov
d1348ea05e
Merge [76119] to release. Refs #6308 .
...
[SVN r76120]
2011-12-23 15:10:51 +00:00
Peter Dimov
90db9a6435
Merge [76086] to release. Fixes #6308 .
...
[SVN r76087]
2011-12-21 00:43:56 +00:00
Peter Dimov
1c208ad3ea
Merge [75392] to release. Fixes #6087 .
...
[SVN r75756]
2011-11-30 18:01:02 +00:00
Peter Dimov
5fc9bf5bc5
Merge [75390] to release. Fixes #4493 .
...
[SVN r75754]
2011-11-30 17:51:43 +00:00
Peter Dimov
c846d230f0
Merge [75389] to release. Fixes #5372 .
...
[SVN r75753]
2011-11-30 17:49:43 +00:00
Peter Dimov
7b097467d6
Merge [75385] to release. Fixes #6099 .
...
[SVN r75386]
2011-11-07 15:05:43 +00:00
Peter Dimov
7cb040edb0
Merge [70452] to release. Fixes #5327 .
...
[SVN r75381]
2011-11-07 14:25:23 +00:00
Peter Dimov
d6ac116b71
Merge [73202] to release.
...
[SVN r73542]
2011-08-05 08:58:31 +00:00
Peter Dimov
8abc8889d1
Merge [69262] to release. Fixes #5018 .
...
[SVN r70447]
2011-03-23 00:13:54 +00:00
Peter Dimov
c5b47e2136
Merge [69261] to release. Fixes #5019 .
...
[SVN r70441]
2011-03-22 23:55:05 +00:00
Peter Dimov
7c0815c567
Merge [69260] to release. Fixes #5216 .
...
[SVN r70440]
2011-03-22 23:51:10 +00:00
Peter Dimov
210288f02e
Merge [69251] to release. Fixes #4127 .
...
[SVN r70439]
2011-03-22 23:45:59 +00:00
Peter Dimov
cf7b6904e8
Merge [69250] to release. Fixes #4256 . Fixes #3875 .
...
[SVN r70436]
2011-03-22 23:38:12 +00:00
Peter Dimov
b978919dd1
Merge [69246] to release. Fixes #4478 .
...
[SVN r70435]
2011-03-22 23:29:35 +00:00
Peter Dimov
1086aff971
Merge [69245] to release. Fixes #4433 .
...
[SVN r70434]
2011-03-22 23:23:44 +00:00
Peter Dimov
445e8d1728
Merge [69244] to release. Fixes #4892 .
...
[SVN r70433]
2011-03-22 23:17:51 +00:00
Peter Dimov
545745d649
Merge [69242] to release. Fixes #4288 . Fixes #5189 .
...
[SVN r70432]
2011-03-22 23:05:48 +00:00
Hartmut Kaiser
d71cc6ab08
Merging from trunk
...
[SVN r66166]
2010-10-24 22:24:54 +00:00
Peter Dimov
0d77fd0678
Merge [62248] to release. Fixes #3856 .
...
[SVN r63827]
2010-07-10 21:17:40 +00:00
Peter Dimov
6ca6d3ce6f
Merge [62246] to release. Fixes #4217 .
...
[SVN r63826]
2010-07-10 21:07:05 +00:00
Peter Dimov
cfc82854d3
Merge [62245] to release. Fixes #4199 .
...
[SVN r63825]
2010-07-10 20:46:53 +00:00
Peter Dimov
b9d77d877e
Merge [61344] to release. Fixes #4108 .
...
[SVN r62244]
2010-05-26 17:34:01 +00:00
Peter Dimov
1f50e3abe4
Merge [61574], [61575], [61579] to release.
...
[SVN r62243]
2010-05-26 17:25:06 +00:00
Peter Dimov
697f338510
Merge [61074]. Fixes #4067 .
...
[SVN r61078]
2010-04-05 19:37:32 +00:00
Peter Dimov
f4386409d9
Merge [58275], [58306] to release.
...
[SVN r58380]
2009-12-14 17:44:19 +00:00
Peter Dimov
ba349679f3
Merge [58123], [58127], [58128] to release. Fixes #3666 .
...
[SVN r58195]
2009-12-06 17:50:28 +00:00
Peter Dimov
a3b84f8586
Merge [58094] to release.
...
[SVN r58122]
2009-12-03 17:50:37 +00:00
Peter Dimov
b0fd8a6b08
Merge [57957] to release. Fixes #3570 .
...
[SVN r58067]
2009-11-30 20:34:39 +00:00
Peter Dimov
4f5062004a
Merge [57954], [57955] to release.
...
[SVN r58066]
2009-11-30 20:30:22 +00:00
Peter Dimov
f040bed751
Merge [57953] to release. Fixes #2681 .
...
[SVN r58065]
2009-11-30 20:25:01 +00:00
Peter Dimov
2f8945a885
Merge [57951] to release. Fixes #3351 .
...
[SVN r58064]
2009-11-30 20:20:52 +00:00
Peter Dimov
2bd0778778
Merge [57949] to release. Fixes #3678 . Fixes #3341 .
...
[SVN r58063]
2009-11-30 20:17:14 +00:00
Peter Dimov
eec640bfd7
Merge [57520] to release. Fixes #2962 .
...
[SVN r57960]
2009-11-26 22:10:30 +00:00
Peter Dimov
63b17c24ea
Merge [51909], [51912], [52937], [53672] to release.
...
[SVN r55479]
2009-08-08 23:21:15 +00:00
Joaquín M López Muñoz
9f30442d1e
merged [52456], [52457] and [52464] from trunk
...
[SVN r52486]
2009-04-19 10:17:50 +00:00