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/Ice/Reference.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/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 464820b4ed1..d9dc1f197c4 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -297,7 +297,7 @@ IceInternal::Reference::operator==(const Reference& r) const return false; } - if(_overrideCompress != r._overrideCompress || _overrideCompress && _compress != r._compress) + if((_overrideCompress != r._overrideCompress) || (_overrideCompress && _compress != r._compress)) { return false; } @@ -1187,7 +1187,7 @@ IceInternal::RoutableReference::operator==(const Reference& r) const { return false; } - if(_overrideTimeout != rhs->_overrideTimeout || _overrideTimeout && _timeout != rhs->_timeout) + if((_overrideTimeout != rhs->_overrideTimeout) || (_overrideTimeout && _timeout != rhs->_timeout)) { return false; } |