From 215771c83d137bbc8574746cb8c8790a77665b9d Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 16 Nov 2012 14:11:25 +0000 Subject: [PATCH] Merged [81348] from trunk. Fixes #7693. [SVN r81367] --- include/boost/smart_ptr/detail/sp_counted_base.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/smart_ptr/detail/sp_counted_base.hpp b/include/boost/smart_ptr/detail/sp_counted_base.hpp index fd9eab4..17bd517 100644 --- a/include/boost/smart_ptr/detail/sp_counted_base.hpp +++ b/include/boost/smart_ptr/detail/sp_counted_base.hpp @@ -35,12 +35,12 @@ #elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) && !defined(__PATHSCALE__) # include -#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER ) && !defined(__PATHSCALE__) -# include - #elif defined(__HP_aCC) && defined(__ia64) # include +#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER ) && !defined(__PATHSCALE__) +# include + #elif defined( __IBMCPP__ ) && defined( __powerpc ) # include