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/IceGrid/Allocatable.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/IceGrid/Allocatable.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Allocatable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp index 54641f14e5b..e078564d5a5 100644 --- a/cpp/src/IceGrid/Allocatable.cpp +++ b/cpp/src/IceGrid/Allocatable.cpp @@ -147,7 +147,7 @@ AllocationRequest::AllocationRequest(const SessionIPtr& session) : } Allocatable::Allocatable(bool allocatable, const AllocatablePtr& parent) : - _allocatable(allocatable || parent && parent->isAllocatable()), + _allocatable(allocatable || (parent && parent->isAllocatable())), _count(0), _releasing(false) { @@ -277,7 +277,7 @@ Allocatable::release(const SessionIPtr& session, bool fromRelease) // there's no request, just notify the allocatable that it can // be allocated again. // - if(request && allocatable->allocate(request, true) || !request && allocatable->canTryAllocate()) + if((request && allocatable->allocate(request, true)) || (!request && allocatable->canTryAllocate())) { while(true) { |