From 4c98df7c57c03e5664afccb01bf2ac2f53a00618 Mon Sep 17 00:00:00 2001 From: Bryce Adelstein-Lelbach Date: Sun, 14 Oct 2012 23:06:12 +0000 Subject: [PATCH] Update smart_ptr for the latest version of the PathScale compiler. [SVN r80988] --- include/boost/smart_ptr/detail/sp_counted_base.hpp | 8 ++++---- include/boost/smart_ptr/detail/sp_has_sync.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/smart_ptr/detail/sp_counted_base.hpp b/include/boost/smart_ptr/detail/sp_counted_base.hpp index a393736..606e3d5 100644 --- a/include/boost/smart_ptr/detail/sp_counted_base.hpp +++ b/include/boost/smart_ptr/detail/sp_counted_base.hpp @@ -35,10 +35,10 @@ #elif defined( __SNC__ ) # include -#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) +#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) && !defined(__PATHSCALE__) # include -#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER ) +#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER ) && !defined(__PATHSCALE__) # include #elif defined(__HP_aCC) && defined(__ia64) @@ -50,10 +50,10 @@ #elif defined( __MWERKS__ ) && defined( __POWERPC__ ) # include -#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) +#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__) # include -#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) +#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__) # include #elif defined( BOOST_SP_HAS_SYNC ) diff --git a/include/boost/smart_ptr/detail/sp_has_sync.hpp b/include/boost/smart_ptr/detail/sp_has_sync.hpp index 67f4c38..c266e75 100644 --- a/include/boost/smart_ptr/detail/sp_has_sync.hpp +++ b/include/boost/smart_ptr/detail/sp_has_sync.hpp @@ -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