--- C:\Users\luke\Desktop\memory_util.hpp.orig	2012-01-02 16:53:54.000000000 +0100
+++ C:\Users\luke\Desktop\memory_util.hpp	2012-06-27 10:33:16.000000000 +0100
@@ -179,41 +179,43 @@
 //struct type_rebind_mode
 ///////////////////////////
 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*);

    static const bool value = (1 == sizeof(test<Ptr>(0, 0)));
 };

 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*);

    static const bool value = (1 == sizeof(test<Ptr>(0, 0)));
 };

 template <typename Ptr, typename T>
 struct type_rebind_mode
 {
-   template <typename X>
-   static char test(int, typename X::template rebind<T>::other*);
-
-   template <typename X>
-   static int test(boost::intrusive::detail::LowPriorityConversion<int>, void*);
-
    static const unsigned int rebind =       (unsigned int)type_has_rebind<Ptr, T>::value;
    static const unsigned int rebind_other = (unsigned int)type_has_rebind_other<Ptr, T>::value;
    static const unsigned int mode =         rebind + rebind*rebind_other;
 };

 ////////////////////////