|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r82189 - in branches/release: . boost boost/smart_ptr boost/smart_ptr/detail libs libs/smart_ptr libs/smart_ptr/test libs/thread/doc
From: pdimov_at_[hidden]
Date: 2012-12-23 11:07:28
Author: pdimov
Date: 2012-12-23 11:07:27 EST (Sun, 23 Dec 2012)
New Revision: 82189
URL: http://svn.boost.org/trac/boost/changeset/82189
Log:
Merged revision(s) 82188 from trunk: Untabify.
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)
branches/release/libs/thread/doc/ (props changed)
Text files modified:
branches/release/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp | 2 +-
branches/release/boost/smart_ptr/shared_ptr.hpp | 8 ++++----
branches/release/libs/smart_ptr/test/array_fail_upa_sp_a.cpp | 2 +-
branches/release/libs/smart_ptr/test/array_fail_upa_sp_c.cpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
Modified: branches/release/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp (original)
+++ branches/release/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp 2012-12-23 11:07:27 EST (Sun, 23 Dec 2012)
@@ -30,7 +30,7 @@
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 )
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-23 11:07:27 EST (Sun, 23 Dec 2012)
@@ -910,12 +910,12 @@
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();
@@ -928,7 +928,7 @@
{
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
@@ -936,7 +936,7 @@
if(del_wrapper) del = del_wrapper->::boost::detail::esft2_deleter_wrapper::get_deleter<D>();
}
- return del;
+ return del;
}
// atomic access
Modified: branches/release/libs/smart_ptr/test/array_fail_upa_sp_a.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/array_fail_upa_sp_a.cpp (original)
+++ branches/release/libs/smart_ptr/test/array_fail_upa_sp_a.cpp 2012-12-23 11:07:27 EST (Sun, 23 Dec 2012)
@@ -15,6 +15,6 @@
int main()
{
- std::unique_ptr<X[]> px;
+ std::unique_ptr<X[]> px;
boost::shared_ptr<X> px2; px2 = px;
}
Modified: branches/release/libs/smart_ptr/test/array_fail_upa_sp_c.cpp
==============================================================================
--- branches/release/libs/smart_ptr/test/array_fail_upa_sp_c.cpp (original)
+++ branches/release/libs/smart_ptr/test/array_fail_upa_sp_c.cpp 2012-12-23 11:07:27 EST (Sun, 23 Dec 2012)
@@ -15,6 +15,6 @@
int main()
{
- std::unique_ptr<X[]> px;
+ std::unique_ptr<X[]> px;
boost::shared_ptr<X> px2( px );
}
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