[Boost-commit] svn:boost r77318 - in branches/release: . boost boost/smart_ptr/detail

Subject: [Boost-commit] svn:boost r77318 - in branches/release: . boost boost/smart_ptr/detail
From: pdimov_at_[hidden]
Date: 2012-03-12 13:40:03

Author: pdimov
Date: 2012-03-12 13:40:02 EDT (Mon, 12 Mar 2012)
New Revision: 77318
URL: http://svn.boost.org/trac/boost/changeset/77318

Log:
Merge [77316] to release. Closes #6667.
Added:
   branches/release/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
      - copied unchanged from r77316, /trunk/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
Text files modified: 
   branches/release/boost/smart_ptr/detail/sp_counted_base.hpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: branches/release/boost/smart_ptr/detail/sp_counted_base.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/sp_counted_base.hpp	(original)
+++ branches/release/boost/smart_ptr/detail/sp_counted_base.hpp	2012-03-12 13:40:02 EDT (Mon, 12 Mar 2012)
@@ -41,6 +41,9 @@
 #elif defined(__HP_aCC) && defined(__ia64)
 # include <boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp>
 
+#elif defined( __IBMCPP__ ) && defined( __powerpc )
+# include <boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp>
+
 #elif defined( __MWERKS__ ) && defined( __POWERPC__ )
 # include <boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp>
 
@@ -59,9 +62,6 @@
 #elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__)
 # include <boost/smart_ptr/detail/sp_counted_base_w32.hpp>
 
-#elif defined( _AIX )
-# include <boost/smart_ptr/detail/sp_counted_base_aix.hpp>
-
 #elif !defined( BOOST_HAS_THREADS )
 # include <boost/smart_ptr/detail/sp_counted_base_nt.hpp>