[Boost-commit] svn:boost r80988 - trunk/boost/smart_ptr/detail

Subject: [Boost-commit] svn:boost r80988 - trunk/boost/smart_ptr/detail
From: blelbach_at_[hidden]
Date: 2012-10-14 19:06:12

Author: wash
Date: 2012-10-14 19:06:12 EDT (Sun, 14 Oct 2012)
New Revision: 80988
URL: http://svn.boost.org/trac/boost/changeset/80988

Log:
Update smart_ptr for the latest version of the PathScale compiler.

Text files modified: 
   trunk/boost/smart_ptr/detail/sp_counted_base.hpp |     8 ++++----                                
   trunk/boost/smart_ptr/detail/sp_has_sync.hpp     |     2 +-                                      
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/smart_ptr/detail/sp_counted_base.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/sp_counted_base.hpp	(original)
+++ trunk/boost/smart_ptr/detail/sp_counted_base.hpp	2012-10-14 19:06:12 EDT (Sun, 14 Oct 2012)
@@ -35,10 +35,10 @@
 #elif defined( __SNC__ )
 # include <boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp>
 
-#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
+#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) && !defined(__PATHSCALE__)
 # include <boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp>
 
-#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER )
+#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER ) && !defined(__PATHSCALE__)
 # include <boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp>
 
 #elif defined(__HP_aCC) && defined(__ia64)
@@ -50,10 +50,10 @@
 #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 ) )
+#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__)
 # include <boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp>
 
-#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) )
+#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__)
 # include <boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp>
 
 #elif defined( BOOST_SP_HAS_SYNC )

Modified: trunk/boost/smart_ptr/detail/sp_has_sync.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/sp_has_sync.hpp	(original)
+++ trunk/boost/smart_ptr/detail/sp_has_sync.hpp	2012-10-14 19:06:12 EDT (Sun, 14 Oct 2012)
@@ -48,7 +48,7 @@
 #undef BOOST_SP_HAS_SYNC
 #endif
 
-#if defined (__PATHSCALE__)
+#if defined(__PATHSCALE__) && ((__PATHCC__ == 4) && (__PATHCC_MINOR__ < 9)) 
 #undef BOOST_SP_HAS_SYNC
 #endif