| 1 | *** memory_util.hpp.original Thu Mar 6 11:11:18 2014
|
|---|
| 2 | --- memory_util.hpp Thu Mar 6 11:11:26 2014
|
|---|
| 3 | ***************
|
|---|
| 4 | *** 186,192 ****
|
|---|
| 5 | struct type_has_rebind
|
|---|
| 6 | {
|
|---|
| 7 | template <typename X>
|
|---|
| 8 | ! #if !defined (__SUNPRO_CC)
|
|---|
| 9 | static char test(int, typename X::template rebind<T>*);
|
|---|
| 10 | #else
|
|---|
| 11 | static char test(int, typename X::rebind<T>*);
|
|---|
| 12 | --- 186,192 ----
|
|---|
| 13 | struct type_has_rebind
|
|---|
| 14 | {
|
|---|
| 15 | template <typename X>
|
|---|
| 16 | ! #if !defined (__SUNPRO_CC) || (__SUNPRO_CC >= 0x5120)
|
|---|
| 17 | static char test(int, typename X::template rebind<T>*);
|
|---|
| 18 | #else
|
|---|
| 19 | static char test(int, typename X::rebind<T>*);
|
|---|
| 20 | ***************
|
|---|
| 21 | *** 202,208 ****
|
|---|
| 22 | struct type_has_rebind_other
|
|---|
| 23 | {
|
|---|
| 24 | template <typename X>
|
|---|
| 25 | ! #if !defined (__SUNPRO_CC)
|
|---|
| 26 | static char test(int, typename X::template rebind<T>::other*);
|
|---|
| 27 | #else
|
|---|
| 28 | static char test(int, typename X::rebind<T>::other*);
|
|---|
| 29 | --- 202,208 ----
|
|---|
| 30 | struct type_has_rebind_other
|
|---|
| 31 | {
|
|---|
| 32 | template <typename X>
|
|---|
| 33 | ! #if !defined (__SUNPRO_CC) || (__SUNPRO_CC >= 0x5120)
|
|---|
| 34 | static char test(int, typename X::template rebind<T>::other*);
|
|---|
| 35 | #else
|
|---|
| 36 | static char test(int, typename X::rebind<T>::other*);
|
|---|