diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-03-18 01:37:51 -0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-18 01:37:51 -0800 |
| commit | aa0fcb15afd952144967d873bfc7b86d93973192 (patch) | |
| tree | e657bb26128e8b1ba27353504bdbe7d2b4e3da98 /cpp/src/IcePatch2/Util.cpp | |
| parent | Got rid of redundant #ifdef. (Bug 2429.) (diff) | |
| download | ice-aa0fcb15afd952144967d873bfc7b86d93973192.tar.bz2 ice-aa0fcb15afd952144967d873bfc7b86d93973192.tar.xz ice-aa0fcb15afd952144967d873bfc7b86d93973192.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2719
Squashed commit of the following:
commit 5ff1fac3e73ef4fb3ac96a692812a849ff585ebc
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Mar 18 01:27:20 2008 -0800
Fixed the various && || warnings from gcc.
Diffstat (limited to 'cpp/src/IcePatch2/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index 5b53c99c9c3..e6422df2a87 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -279,7 +279,7 @@ IcePatch2::simplify(const string& path) } if(result == "/." || - result.size() == 4 && isalpha(result[0]) && result[1] == ':' && result[2] == '/' && result[3] == '.') + (result.size() == 4 && isalpha(result[0]) && result[1] == ':' && result[2] == '/' && result[3] == '.')) { return result.substr(0, result.size() - 1); } @@ -289,7 +289,7 @@ 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(result[0]) && result[1] == ':' && result[2] == '/')) { return result; } @@ -346,7 +346,7 @@ IcePatch2::getSuffix(const string& pa) string::size_type dotPos = path.rfind('.'); string::size_type slashPos = path.rfind('/'); - if(dotPos == string::npos || slashPos != string::npos && slashPos > dotPos) + if(dotPos == string::npos || (slashPos != string::npos && slashPos > dotPos)) { return string(); } @@ -362,7 +362,7 @@ IcePatch2::getWithoutSuffix(const string& pa) string::size_type dotPos = path.rfind('.'); string::size_type slashPos = path.rfind('/'); - if(dotPos == string::npos || slashPos != string::npos && slashPos > dotPos) + if(dotPos == string::npos || (slashPos != string::npos && slashPos > dotPos)) { return path; } |