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

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

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

Log:
Merged [80988] from trunk.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
Text files modified: 
   branches/release/boost/smart_ptr/detail/sp_counted_base.hpp |     8 ++++----                                
   branches/release/boost/smart_ptr/detail/sp_has_sync.hpp     |     4 ++++                                    
   2 files changed, 8 insertions(+), 4 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:51:00 EST (Wed, 14 Nov 2012)
@@ -32,10 +32,10 @@
 #elif defined( BOOST_DISABLE_THREADS ) && !defined( BOOST_SP_ENABLE_THREADS ) && !defined( BOOST_DISABLE_WIN32 )
 # include <boost/smart_ptr/detail/sp_counted_base_nt.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)
@@ -47,10 +47,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: branches/release/boost/smart_ptr/detail/sp_has_sync.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/sp_has_sync.hpp	(original)
+++ branches/release/boost/smart_ptr/detail/sp_has_sync.hpp	2012-11-14 06:51:00 EST (Wed, 14 Nov 2012)
@@ -48,6 +48,10 @@
 #undef BOOST_SP_HAS_SYNC
 #endif
 
+#if defined(__PATHSCALE__) && ((__PATHCC__ == 4) && (__PATHCC_MINOR__ < 9)) 
+#undef BOOST_SP_HAS_SYNC
+#endif
+
 #endif // __GNUC__ * 100 + __GNUC_MINOR__ >= 401
 
 #endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_HAS_SYNC_HPP_INCLUDED