Merged 43316, 43317, 43318, 43733, 43782, 43873, 43888, 43916, 43950, 44055, 44056, 44058, 44073, 44074, 44132, 44137, 44138, 44140, 44344 from trunk to release

[SVN r47339]
2008-07-12 09:55:08 +00:00
parent a9cd84f43d
commit 866590ee97
26 changed files with 1256 additions and 31 deletions
--- a/test/shared_from_this_test.cpp
+++ b/test/shared_from_this_test.cpp
@@ -133,7 +133,8 @@ void test3()
    try
    {
        boost::shared_ptr<V> r = v2.shared_from_this();
-        BOOST_ERROR("v2.shared_from_this() failed to throw");
+        BOOST_TEST( p < r || r < p );
+        BOOST_TEST( r.get() == &v2 );
    }
    catch(boost::bad_weak_ptr const &)
    {