summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Allocatable.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/Allocatable.cpp')
-rw-r--r--cpp/src/IceGrid/Allocatable.cpp4
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)
{