From 85a9400cebedaa1c319937b790acee352b44ff07 Mon Sep 17 00:00:00 2001
From: akumta <aparna.kumta@oracle.com>
Date: Tue, 3 Mar 2015 11:37:28 -0800
Subject: [PATCH 1/2] Update addressof.hpp

To update ticket# 10311
---
 include/boost/core/addressof.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/core/addressof.hpp b/include/boost/core/addressof.hpp
index 6a770e2..4152fa1 100644
--- a/include/boost/core/addressof.hpp
+++ b/include/boost/core/addressof.hpp
@@ -107,7 +107,7 @@ template<class T>
 BOOST_FORCEINLINE
 T * addressof( T & v )
 {
-#if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || defined( __SUNPRO_CC )
+#if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || (defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5120))
 
     return boost::detail::addressof_impl<T>::f( v, 0 );
 

From 67970b9d946a18293e31b1d8deb3a3b6843819d8 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Mon, 9 Mar 2015 00:32:02 +0200
Subject: [PATCH 2/2] Use BOOST_WORKAROUND.

---
 include/boost/core/addressof.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/core/addressof.hpp b/include/boost/core/addressof.hpp
index 4152fa1..889b582 100644
--- a/include/boost/core/addressof.hpp
+++ b/include/boost/core/addressof.hpp
@@ -107,7 +107,7 @@ template<class T>
 BOOST_FORCEINLINE
 T * addressof( T & v )
 {
-#if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || (defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5120))
+#if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || (defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120))
 
     return boost::detail::addressof_impl<T>::f( v, 0 );