Skip to content

Commit

Permalink
Untabify.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.boost.org/svn/boost/trunk@82188 b8fc166d-592f-0410-95f2-cb63ce0dd405
  • Loading branch information
pdimov committed Dec 23, 2012
1 parent 6abd135 commit a0a3cca
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace detail

inline uint32_t compare_and_swap( uint32_t * dest_, uint32_t compare_, uint32_t swap_ )
{
return __builtin_cellAtomicCompareAndSwap32(dest_,compare_,swap_);
return __builtin_cellAtomicCompareAndSwap32(dest_,compare_,swap_);
}

inline uint32_t atomic_fetch_and_add( uint32_t * pw, uint32_t dv )
Expand Down
8 changes: 4 additions & 4 deletions boost/smart_ptr/shared_ptr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -910,12 +910,12 @@ class esft2_deleter_wrapper
deleter_ = deleter;
}

template<typename D> D* get_deleter() const BOOST_NOEXCEPT
template<typename D> D* get_deleter() const BOOST_NOEXCEPT
{
return boost::detail::basic_get_deleter<D>( deleter_ );
}

template< class T> void operator()( T* )
template< class T> void operator()( T* )
{
BOOST_ASSERT( deleter_.use_count() <= 1 );
deleter_.reset();
Expand All @@ -928,15 +928,15 @@ template<class D, class T> D * get_deleter( shared_ptr<T> const & p ) BOOST_NOEX
{
D *del = boost::detail::basic_get_deleter<D>(p);

if(del == 0)
if(del == 0)
{
boost::detail::esft2_deleter_wrapper *del_wrapper = boost::detail::basic_get_deleter<boost::detail::esft2_deleter_wrapper>(p);
// The following get_deleter method call is fully qualified because
// older versions of gcc (2.95, 3.2.3) fail to compile it when written del_wrapper->get_deleter<D>()
if(del_wrapper) del = del_wrapper->::boost::detail::esft2_deleter_wrapper::get_deleter<D>();
}

return del;
return del;
}

// atomic access
Expand Down
2 changes: 1 addition & 1 deletion libs/smart_ptr/test/array_fail_upa_sp_a.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ struct X

int main()
{
std::unique_ptr<X[]> px;
std::unique_ptr<X[]> px;
boost::shared_ptr<X> px2; px2 = px;
}
2 changes: 1 addition & 1 deletion libs/smart_ptr/test/array_fail_upa_sp_c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ struct X

int main()
{
std::unique_ptr<X[]> px;
std::unique_ptr<X[]> px;
boost::shared_ptr<X> px2( px );
}

0 comments on commit a0a3cca

Please sign in to comment.