diff options
| author | Michi Henning <michi@zeroc.com> | 2002-07-08 23:39:34 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2002-07-08 23:39:34 +0000 |
| commit | 217d4df7b022a3d928fabe9b2e820cb149b69c47 (patch) | |
| tree | a3fbf1383aede011d360ebb0484b98bf97538528 /cpp/src | |
| parent | Style fixes: Changed INT64MIN and INT64MAX to Int64Min and Int64Max. (diff) | |
| download | ice-217d4df7b022a3d928fabe9b2e820cb149b69c47.tar.bz2 ice-217d4df7b022a3d928fabe9b2e820cb149b69c47.tar.xz ice-217d4df7b022a3d928fabe9b2e820cb149b69c47.zip | |
Fixed INT64MIN -> Int64Min and INT64MAX -> Int64Max in Windows-specific
code.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceUtil/InputUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp index 193aff767af..073400a2e36 100644 --- a/cpp/src/IceUtil/InputUtil.cpp +++ b/cpp/src/IceUtil/InputUtil.cpp @@ -111,12 +111,12 @@ strToInt64(const char* s, char** endptr, int base) { int digit = digitVal[toupper(*s) - '0']; assert(digit != 100); - if(result < INT64MAX / base) + if(result < Int64Max / base) { result *= base; result += digit; } - else if((digit <= INT64MAX % base) || (sign == -1 && digit == INT64MAX % base + 1)) + else if((digit <= Int64Max % base) || (sign == -1 && digit == Int64Max % base + 1)) { result *= base; result += digit; @@ -124,7 +124,7 @@ strToInt64(const char* s, char** endptr, int base) else { overflow = true; - result = sign == -1 ? INT64MIN : INT64MAX; + result = sign == -1 ? Int64Min : Int64Max; } } ++s; |