forked from boostorg/smart_ptr
Merge [61574], [61575], [61579] to release.
[SVN r62243]
This commit is contained in:
@@ -12,14 +12,14 @@
|
||||
#include <boost/make_shared.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
#ifndef BOOST_HAS_RVALUE_REFS
|
||||
#if !defined( BOOST_HAS_RVALUE_REFS ) || !defined( BOOST_HAS_VARIADIC_TMPL )
|
||||
|
||||
int main()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else // BOOST_HAS_RVALUE_REFS
|
||||
#else // BOOST_HAS_RVALUE_REFS, BOOST_HAS_VARIADIC_TMPL
|
||||
|
||||
class myarg
|
||||
{
|
||||
|
||||
@@ -914,7 +914,6 @@ void test()
|
||||
BOOST_TEST(wp2.use_count() == 0);
|
||||
BOOST_TEST(!(wp < wp3 || wp3 < wp));
|
||||
|
||||
using std::swap;
|
||||
swap(wp, wp2);
|
||||
|
||||
BOOST_TEST(wp.use_count() == 0);
|
||||
@@ -950,7 +949,6 @@ void test()
|
||||
BOOST_TEST(wp2.use_count() == 0);
|
||||
BOOST_TEST(!(wp < wp3 || wp3 < wp));
|
||||
|
||||
using std::swap;
|
||||
swap(wp, wp2);
|
||||
|
||||
BOOST_TEST(wp.use_count() == 0);
|
||||
@@ -965,7 +963,6 @@ void test()
|
||||
BOOST_TEST(wp2.use_count() == 0);
|
||||
BOOST_TEST(!(wp < wp3 || wp3 < wp));
|
||||
|
||||
using std::swap;
|
||||
swap(wp, wp2);
|
||||
|
||||
BOOST_TEST(wp.use_count() == 0);
|
||||
|
||||
Reference in New Issue
Block a user