diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-05-09 09:59:37 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-09 09:59:37 +0000 |
| commit | 754eac4c3527879ebf43fcd38a9970c0e735e00d (patch) | |
| tree | e6ce1c6aab5402f0e0acf046ed841738bc95627b /cpp/src/IceGrid/Allocatable.cpp | |
| parent | Simplified Application view; fixed PropertySets issues (diff) | |
| download | ice-754eac4c3527879ebf43fcd38a9970c0e735e00d.tar.bz2 ice-754eac4c3527879ebf43fcd38a9970c0e735e00d.tar.xz ice-754eac4c3527879ebf43fcd38a9970c0e735e00d.zip | |
Fixed allocateByType bug, fixed TODO XXX
Diffstat (limited to 'cpp/src/IceGrid/Allocatable.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Allocatable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp index da88a46db4e..4f7dff85b83 100644 --- a/cpp/src/IceGrid/Allocatable.cpp +++ b/cpp/src/IceGrid/Allocatable.cpp @@ -152,12 +152,12 @@ AllocationRequest::AllocationRequest(const SessionIPtr& session) : } Allocatable::Allocatable(bool allocatable, const AllocatablePtr& parent) : - _allocatable(allocatable || parent && parent->allocatable()), - _parent((parent && parent->allocatable()) ? parent : AllocatablePtr()), + _allocatable(allocatable || parent && parent->isAllocatable()), + _parent((parent && parent->isAllocatable()) ? parent : AllocatablePtr()), _count(0), _releasing(false) { - assert(!_parent || _parent->allocatable()); // Parent is only set if it's allocatable. + assert(!_parent || _parent->isAllocatable()); // Parent is only set if it's allocatable. } Allocatable::~Allocatable() |