OLD | NEW |
(Empty) | |
| 1 Index: common/unicode/unistr.h |
| 2 =================================================================== |
| 3 --- common/unicode/unistr.h (revision 75773) |
| 4 +++ common/unicode/unistr.h (working copy) |
| 5 @@ -4089,7 +4089,7 @@ |
| 6 #if defined(__GNUC__) |
| 7 // Ticket #7039: Clip length to the maximum valid length to the end of addres
sable memory given the starting address |
| 8 // This is only an issue when using GCC and certain optimizations are turned
on. |
| 9 - return extract(start, _length, dst, dst!=0 ? ((dst >= (char*)((size_t)-1) - U
INT32_MAX) ? (((char*)UINT32_MAX) - dst) : UINT32_MAX) : 0, codepage); |
| 10 + return extract(start, _length, dst, dst!=0 ? ((dst >= (char*)((size_t)-1) - U
INT32_MAX) ? static_cast<unsigned int>((((char*)UINT32_MAX) - dst)) : UINT32_MAX
) : 0, codepage); |
| 11 #else |
| 12 return extract(start, _length, dst, dst!=0 ? 0xffffffff : 0, codepage); |
| 13 #endif |
OLD | NEW |