diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-10-30 13:58:03 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-10-30 13:58:03 -0230 |
| commit | 07de2f5bc3a42b00812b1e5677548cbd45f6f203 (patch) | |
| tree | c555541f713f9412f4a88995e300f22f8d23aba2 /cpp/src/IcePatch2/Util.cpp | |
| parent | Bug 3380 - windows release build broken (diff) | |
| download | ice-07de2f5bc3a42b00812b1e5677548cbd45f6f203.tar.bz2 ice-07de2f5bc3a42b00812b1e5677548cbd45f6f203.tar.xz ice-07de2f5bc3a42b00812b1e5677548cbd45f6f203.zip | |
Bug 3519 - fix isalpha, isprint, ... usage
Diffstat (limited to 'cpp/src/IcePatch2/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index 2b572c27e57..f4f6c32ddf6 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -280,7 +280,8 @@ IcePatch2::simplify(const string& path) } if(result == "/." || - (result.size() == 4 && isalpha(result[0]) && result[1] == ':' && result[2] == '/' && result[3] == '.')) + (result.size() == 4 && isalpha(static_cast<unsigned char>(result[0])) && result[1] == ':' && + result[2] == '/' && result[3] == '.')) { return result.substr(0, result.size() - 1); } @@ -290,7 +291,8 @@ IcePatch2::simplify(const string& path) result.erase(result.size() - 2, 2); } - if(result == "/" || (result.size() == 3 && isalpha(result[0]) && result[1] == ':' && result[2] == '/')) + if(result == "/" || (result.size() == 3 && isalpha(static_cast<unsigned char>(result[0])) && result[1] == ':' && + result[2] == '/')) { return result; } @@ -313,7 +315,8 @@ IcePatch2::isRoot(const string& pa) { string path = simplify(pa); #ifdef _WIN32 - return path == "/" || path.size() == 3 && isalpha(path[0]) && path[1] == ':' && path[2] == '/'; + return path == "/" || path.size() == 3 && isalpha(static_cast<unsigned char>(path[0])) && path[1] == ':' && + path[2] == '/'; #else return path == "/"; #endif |