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

Subject: [Boost-commit] svn:boost r81332 - in branches/release: . boost boost/smart_ptr/detail
From: pdimov_at_[hidden]
Date: 2012-11-14 06:53:06

Author: pdimov
Date: 2012-11-14 06:53:05 EST (Wed, 14 Nov 2012)
New Revision: 81332
URL: http://svn.boost.org/trac/boost/changeset/81332

Log:
Merged [81126] from trunk. Fixes #6996.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
Text files modified: 
   branches/release/boost/smart_ptr/detail/sp_counted_base.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 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-11-14 06:53:05 EST (Wed, 14 Nov 2012)
@@ -47,7 +47,7 @@
 #elif defined( __MWERKS__ ) && defined( __POWERPC__ )
 # include <boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp>
 
-#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__)
+#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__) && !defined( _AIX )
 # include <boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp>
 
 #elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__)