*** memory_util.hpp.original	Thu Mar  6 11:11:18 2014
--- memory_util.hpp	Thu Mar  6 11:11:26 2014
***************
*** 186,192 ****
  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>*);
--- 186,192 ----
  struct type_has_rebind
  {
     template <typename X>
!    #if !defined (__SUNPRO_CC) || (__SUNPRO_CC >= 0x5120)
     static char test(int, typename X::template rebind<T>*);
     #else
     static char test(int, typename X::rebind<T>*);
***************
*** 202,208 ****
  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*);
--- 202,208 ----
  struct type_has_rebind_other
  {
     template <typename X>
!    #if !defined (__SUNPRO_CC) || (__SUNPRO_CC >= 0x5120)
     static char test(int, typename X::template rebind<T>::other*);
     #else
     static char test(int, typename X::rebind<T>::other*);