From 26acf03a9ba561ae033f353ac8212aa3c56fa6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Tue, 18 Mar 2014 17:30:48 +0100
Subject: [PATCH] Fixed #9746. Deleted workarounds for old SUN_CC compilers,
 those are now unsupported.

---
 doc/intrusive.qbk                              | 3 +++
 include/boost/intrusive/detail/memory_util.hpp | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/doc/intrusive.qbk b/doc/intrusive.qbk
index 847c81e..5eafab2 100644
--- a/doc/intrusive.qbk
+++ b/doc/intrusive.qbk
@@ -3797,11 +3797,14 @@ to be inserted in intrusive containers are allocated using `std::vector` or `std
 *  Fixed bugs:
    *  [@https://svn.boost.org/trac/boost/ticket/8468 #8468: Compile error on visual studio 2010/2012 using vector with custom allocator and aligned types]
    *  [@https://svn.boost.org/trac/boost/ticket/9332 #9332: ['"has_member_function_callable_with.hpp compile error on msvc-12.0"]].
+   *  [@https://svn.boost.org/trac/boost/ticket/9746 #9746: Modern Sun CC compiler detects error in intrusive library header]
 
 *  Optimized tree rebalancing code to avoid redundant assignments.
 
 *  Added 64 bit prime values for `suggested_upper_bucket_count`/`suggested_lower_bucket_count` in 64 bit platforms.
 
+*  Deleted workarounds for old SUN_CC compilers, those are now unsupported as modern SunPro compilers are standard-corforming enough.
+
 [endsect]
 
 [section:release_notes_boost_1_55_00 Boost 1.55 Release]
diff --git a/include/boost/intrusive/detail/memory_util.hpp b/include/boost/intrusive/detail/memory_util.hpp
index e425c3b..a0391bb 100644
--- a/include/boost/intrusive/detail/memory_util.hpp
+++ b/include/boost/intrusive/detail/memory_util.hpp
@@ -186,11 +186,7 @@ template <typename Ptr, typename T>
 struct type_has_rebind
 {
    template <typename X>
-   #if !defined (__SUNPRO_CC)
    static char test(int, typename X::template rebind<T>*);
-   #else
-   static char test(int, typename X::rebind<T>*);
-   #endif
 
    template <typename X>
    static int test(boost::intrusive::detail::LowPriorityConversion<int>, void*);
@@ -202,11 +198,7 @@ template <typename Ptr, typename T>
 struct type_has_rebind_other
 {
    template <typename X>
-   #if !defined (__SUNPRO_CC)
    static char test(int, typename X::template rebind<T>::other*);
-   #else
-   static char test(int, typename X::rebind<T>::other*);
-   #endif
 
    template <typename X>
    static int test(boost::intrusive::detail::LowPriorityConversion<int>, void*);