|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81979 - in branches/release: . boost boost/smart_ptr boost/smart_ptr/detail libs libs/smart_ptr libs/smart_ptr/test
From: pdimov_at_[hidden]
Date: 2012-12-15 15:20:21
Author: pdimov
Date: 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
New Revision: 81979
URL: http://svn.boost.org/trac/boost/changeset/81979
Log:
Merged revision(s) 81900-81901 from trunk:
Replace use of BOOST_HAS_RVALUE_REFS with !BOOST_NO_CXX11_RVALUE_REFERENCES.
........
Replace use of BOOST_HAS_VARIADIC_TMPL with !BOOST_NO_CXX11_VARIADIC_TEMPLATES.
........
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/smart_ptr/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/smart_ptr/ (props changed)
Text files modified:
branches/release/boost/smart_ptr/detail/shared_count.hpp | 4 ++--
branches/release/boost/smart_ptr/detail/sp_forward.hpp | 2 +-
branches/release/boost/smart_ptr/intrusive_ptr.hpp | 2 +-
branches/release/boost/smart_ptr/make_shared_object.hpp | 4 ++--
branches/release/boost/smart_ptr/shared_array.hpp | 4 ++--
branches/release/boost/smart_ptr/shared_ptr.hpp | 8 ++++----
branches/release/boost/smart_ptr/weak_ptr.hpp | 6 +++---
branches/release/libs/smart_ptr/make_shared.html | 2 +-
branches/release/libs/smart_ptr/test/allocate_shared_array_args_test.cpp | 2 +-
branches/release/libs/smart_ptr/test/intrusive_ptr_move_test.cpp | 4 ++--
branches/release/libs/smart_ptr/test/make_shared_array_args_test.cpp | 2 +-
branches/release/libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp | 6 +++---
branches/release/libs/smart_ptr/test/shared_ptr_move_test.cpp | 4 ++--
branches/release/libs/smart_ptr/test/weak_ptr_move_test.cpp | 4 ++--
14 files changed, 27 insertions(+), 27 deletions(-)
Modified: branches/release/boost/smart_ptr/detail/shared_count.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/shared_count.hpp (original)
+++ branches/release/boost/smart_ptr/detail/shared_count.hpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -382,7 +382,7 @@
if( pi_ != 0 ) pi_->add_ref_copy();
}
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
shared_count(shared_count && r): pi_(r.pi_) // nothrow
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
@@ -494,7 +494,7 @@
// Move support
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
weak_count(weak_count && r): pi_(r.pi_) // nothrow
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
Modified: branches/release/boost/smart_ptr/detail/sp_forward.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/sp_forward.hpp (original)
+++ branches/release/boost/smart_ptr/detail/sp_forward.hpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -23,7 +23,7 @@
namespace detail
{
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
template< class T > T&& sp_forward( T & t ) BOOST_NOEXCEPT
{
Modified: branches/release/boost/smart_ptr/intrusive_ptr.hpp
==============================================================================
--- branches/release/boost/smart_ptr/intrusive_ptr.hpp (original)
+++ branches/release/boost/smart_ptr/intrusive_ptr.hpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -108,7 +108,7 @@
// Move support
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
intrusive_ptr(intrusive_ptr && rhs) BOOST_NOEXCEPT : px( rhs.px )
{
Modified: branches/release/boost/smart_ptr/make_shared_object.hpp
==============================================================================
--- branches/release/boost/smart_ptr/make_shared_object.hpp (original)
+++ branches/release/boost/smart_ptr/make_shared_object.hpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -199,7 +199,7 @@
return boost::shared_ptr< T >( pt, pt2 );
}
-#if defined( BOOST_HAS_VARIADIC_TMPL ) && defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
// Variadic templates, rvalue reference
@@ -237,7 +237,7 @@
return boost::shared_ptr< T >( pt, pt2 );
}
-#elif defined( BOOST_HAS_RVALUE_REFS )
+#elif !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
// For example MSVC 10.0
Modified: branches/release/boost/smart_ptr/shared_array.hpp
==============================================================================
--- branches/release/boost/smart_ptr/shared_array.hpp (original)
+++ branches/release/boost/smart_ptr/shared_array.hpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -86,7 +86,7 @@
// generated copy constructor, destructor are fine...
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
// ... except in C++0x, move disables the implicit copy
@@ -145,7 +145,7 @@
#endif
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
shared_array & operator=( shared_array && r ) BOOST_NOEXCEPT
{
Modified: branches/release/boost/smart_ptr/shared_ptr.hpp
==============================================================================
--- branches/release/boost/smart_ptr/shared_ptr.hpp (original)
+++ branches/release/boost/smart_ptr/shared_ptr.hpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -389,7 +389,7 @@
// generated copy constructor, destructor are fine...
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
// ... except in C++0x, move disables the implicit copy
@@ -452,7 +452,7 @@
boost::detail::sp_deleter_construct( this, tmp );
}
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
template<class Y>
shared_ptr( std::auto_ptr<Y> && r ): px(r.get()), pn()
@@ -527,7 +527,7 @@
return *this;
}
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
template<class Y>
shared_ptr & operator=( std::auto_ptr<Y> && r )
@@ -562,7 +562,7 @@
// Move support
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
shared_ptr( shared_ptr && r ) BOOST_NOEXCEPT : px( r.px ), pn()
{
Modified: branches/release/boost/smart_ptr/weak_ptr.hpp
==============================================================================
--- branches/release/boost/smart_ptr/weak_ptr.hpp (original)
+++ branches/release/boost/smart_ptr/weak_ptr.hpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -37,7 +37,7 @@
// generated copy constructor, assignment, destructor are fine...
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
// ... except in C++0x, move disables the implicit copy
@@ -86,7 +86,7 @@
boost::detail::sp_assert_convertible< Y, T >();
}
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
template<class Y>
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
@@ -149,7 +149,7 @@
return *this;
}
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
template<class Y>
weak_ptr & operator=( weak_ptr<Y> && r ) BOOST_NOEXCEPT
Modified: branches/release/libs/smart_ptr/make_shared.html
==============================================================================
--- branches/release/libs/smart_ptr/make_shared.html (original)
+++ branches/release/libs/smart_ptr/make_shared.html 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -41,7 +41,7 @@
template<typename T, typename A>
shared_ptr<T> allocate_shared( A const & );
-#if defined( BOOST_HAS_VARIADIC_TMPL ) && defined( BOOST_HAS_RVALUE_REFS ) // C++0x prototypes
+#if !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) // C++0x prototypes
template<typename T, typename... Args>
shared_ptr<T> make_shared( Args && ... args );
Modified: branches/release/libs/smart_ptr/test/allocate_shared_array_args_test.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/allocate_shared_array_args_test.cpp (original)
+++ branches/release/libs/smart_ptr/test/allocate_shared_array_args_test.cpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -57,7 +57,7 @@
BOOST_TEST( X::instances == 0 );
}
-#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
+#if !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
{
boost::shared_ptr< X[] > px = boost::allocate_shared< X[] >( std::allocator<X>(), 2, 1 );
Modified: branches/release/libs/smart_ptr/test/intrusive_ptr_move_test.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/intrusive_ptr_move_test.cpp (original)
+++ branches/release/libs/smart_ptr/test/intrusive_ptr_move_test.cpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -32,7 +32,7 @@
#include <boost/config.hpp>
#include <utility>
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
namespace N
{
@@ -173,7 +173,7 @@
return boost::report_errors();
}
-#else // !defined( BOOST_HAS_RVALUE_REFS )
+#else // defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
int main()
{
Modified: branches/release/libs/smart_ptr/test/make_shared_array_args_test.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/make_shared_array_args_test.cpp (original)
+++ branches/release/libs/smart_ptr/test/make_shared_array_args_test.cpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -56,7 +56,7 @@
BOOST_TEST( X::instances == 0 );
}
-#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
+#if !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
{
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1 );
Modified: branches/release/libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp (original)
+++ branches/release/libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -12,14 +12,14 @@
#include <boost/make_shared.hpp>
#include <boost/shared_ptr.hpp>
-#if !defined( BOOST_HAS_RVALUE_REFS )
+#if defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
int main()
{
return 0;
}
-#else // BOOST_HAS_RVALUE_REFS
+#else // !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
class myarg
{
@@ -95,4 +95,4 @@
return boost::report_errors();
}
-#endif // BOOST_HAS_RVALUE_REFS
+#endif // !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
Modified: branches/release/libs/smart_ptr/test/shared_ptr_move_test.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/shared_ptr_move_test.cpp (original)
+++ branches/release/libs/smart_ptr/test/shared_ptr_move_test.cpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -12,7 +12,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <utility>
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
struct X
{
@@ -97,7 +97,7 @@
return boost::report_errors();
}
-#else // !defined( BOOST_HAS_RVALUE_REFS )
+#else // defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
int main()
{
Modified: branches/release/libs/smart_ptr/test/weak_ptr_move_test.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/weak_ptr_move_test.cpp (original)
+++ branches/release/libs/smart_ptr/test/weak_ptr_move_test.cpp 2012-12-15 15:20:20 EST (Sat, 15 Dec 2012)
@@ -12,7 +12,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <utility>
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
struct X
{
@@ -112,7 +112,7 @@
return boost::report_errors();
}
-#else // !defined( BOOST_HAS_RVALUE_REFS )
+#else // defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
int main()
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk