Ticket #3986: config-smart_ptr.patch

File config-smart_ptr.patch, 5.2 KB (added by Daniel James, 13 years ago)

  • boost/smart_ptr/shared_ptr.hpp

     
    342342
    343343// Move support
    344344
    345 #if defined( BOOST_HAS_RVALUE_REFS )
     345#if !defined(BOOST_NO_RVALUE_REFERENCES)
    346346
    347347    shared_ptr( shared_ptr && r ): px( r.px ), pn() // never throws
    348348    {

  • boost/smart_ptr/detail/shared_count.hpp

     
    228228        if( pi_ != 0 ) pi_->add_ref_copy();
    229229    }
    230230
    231 #if defined( BOOST_HAS_RVALUE_REFS )
     231#if !defined(BOOST_NO_RVALUE_REFERENCES)
    232232
    233233    shared_count(shared_count && r): pi_(r.pi_) // nothrow
    234234#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
    … …  
    335335
    336336// Move support
    337337
    338 #if defined( BOOST_HAS_RVALUE_REFS )
     338#if !defined(BOOST_NO_RVALUE_REFERENCES)
    339339
    340340    weak_count(weak_count && r): pi_(r.pi_) // nothrow
    341341#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)

  • boost/smart_ptr/weak_ptr.hpp

     
    7474    {
    7575    }
    7676
    77 #if defined( BOOST_HAS_RVALUE_REFS )
     77#if !defined(BOOST_NO_RVALUE_REFERENCES)
    7878
    7979    template<class Y>
    8080#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
    … …  
    131131        return *this;
    132132    }
    133133
    134 #if defined( BOOST_HAS_RVALUE_REFS )
     134#if !defined(BOOST_NO_RVALUE_REFERENCES)
    135135
    136136    template<class Y>
    137137    weak_ptr & operator=( weak_ptr<Y> && r )

  • boost/smart_ptr/intrusive_ptr.hpp

     
    113113
    114114// Move support
    115115
    116 #if defined( BOOST_HAS_RVALUE_REFS )
     116#if !defined(BOOST_NO_RVALUE_REFERENCES)
    117117
    118118    intrusive_ptr(intrusive_ptr && rhs): px( rhs.px )
    119119    {

  • boost/smart_ptr/make_shared.hpp

     
    8686    }
    8787};
    8888
    89 #if defined( BOOST_HAS_RVALUE_REFS )
     89#if !defined(BOOST_NO_RVALUE_REFERENCES)
    9090template< class T > T&& forward( T &&t )
    9191{
    9292    return t;
    … …  
    133133    return boost::shared_ptr< T >( pt, pt2 );
    134134}
    135135
    136 #if defined( BOOST_HAS_VARIADIC_TMPL ) && defined( BOOST_HAS_RVALUE_REFS )
     136#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
    137137
    138138// Variadic templates, rvalue reference
    139139

  • libs/smart_ptr/test/intrusive_ptr_move_test.cpp

     
    3333#include <algorithm>
    3434#include <functional>
    3535
    36 #if defined( BOOST_HAS_RVALUE_REFS )
     36#if !defined(BOOST_NO_RVALUE_REFERENCES)
    3737
    3838namespace N
    3939{
    … …  
    174174    return boost::report_errors();
    175175}
    176176
    177 #else // !defined( BOOST_HAS_RVALUE_REFS )
     177#else // defined(BOOST_NO_RVALUE_REFERENCES)
    178178
    179179int main()
    180180{

  • libs/smart_ptr/test/shared_ptr_move_test.cpp

     
    1111#include <boost/shared_ptr.hpp>
    1212#include <boost/detail/lightweight_test.hpp>
    1313
    14 #if defined( BOOST_HAS_RVALUE_REFS )
     14#if !defined(BOOST_NO_RVALUE_REFERENCES)
    1515
    1616struct X
    1717{
    … …  
    9696    return boost::report_errors();
    9797}
    9898
    99 #else // !defined( BOOST_HAS_RVALUE_REFS )
     99#else // defined(BOOST_NO_RVALUE_REFERENCES)
    100100
    101101int main()
    102102{

  • libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp

     
    1212#include <boost/make_shared.hpp>
    1313#include <boost/shared_ptr.hpp>
    1414
    15 #ifndef BOOST_HAS_RVALUE_REFS
     15#ifdef BOOST_NO_RVALUE_REFERENCES
    1616
    1717int main()
    1818{
    1919    return 0;
    2020}
    2121
    22 #else // BOOST_HAS_RVALUE_REFS
     22#else // BOOST_NO_RVALUE_REFERENCES
    2323
    2424class myarg
    2525{
    … …  
    9595    return boost::report_errors();
    9696}
    9797
    98 #endif // BOOST_HAS_RVALUE_REFS
     98#endif // BOOST_NO_RVALUE_REFERENCES

  • libs/smart_ptr/test/weak_ptr_move_test.cpp

     
    1111#include <boost/weak_ptr.hpp>
    1212#include <boost/detail/lightweight_test.hpp>
    1313
    14 #if defined( BOOST_HAS_RVALUE_REFS )
     14#if !defined(BOOST_NO_RVALUE_REFERENCES)
    1515
    1616struct X
    1717{
    … …  
    111111    return boost::report_errors();
    112112}
    113113
    114 #else // !defined( BOOST_HAS_RVALUE_REFS )
     114#else // defined(BOOST_NO_RVALUE_REFERENCES)
    115115
    116116int main()
    117117{