diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-04-25 14:56:52 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-04-25 14:56:52 +0000 |
| commit | 9582f627309dbabf68ae5476cf197e6ab813a12f (patch) | |
| tree | 36dfdf06b5c65c90bc78bc8810264df9b9ef02b2 /cpp/src | |
| parent | More work on object allocation. (diff) | |
| download | ice-9582f627309dbabf68ae5476cf197e6ab813a12f.tar.bz2 ice-9582f627309dbabf68ae5476cf197e6ab813a12f.tar.xz ice-9582f627309dbabf68ae5476cf197e6ab813a12f.zip | |
Fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/ObjectCache.cpp | 4 | ||||
| -rwxr-xr-x | cpp/src/IceGrid/icegridregistry.dsp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp index df39caaef91..cdbb0fceb34 100644 --- a/cpp/src/IceGrid/ObjectCache.cpp +++ b/cpp/src/IceGrid/ObjectCache.cpp @@ -163,14 +163,14 @@ ObjectCache::allocateByType(const string& type, const ObjectAllocationRequestPtr Ice::ObjectProxySeq objects = p->second.getObjects(); random_shuffle(objects.begin(), objects.end(), _rand); // TODO: OPTIMIZE - for(Ice::ObjectProxySeq::const_iterator p = objects.begin(); p != objects.end(); ++p) + for(Ice::ObjectProxySeq::const_iterator q = objects.begin(); q != objects.end(); ++q) { // // If tryAllocate() returns true, either the object was // successfully allocated or the request canceled. In both // cases, we're done! // - if(getImpl((*p)->ice_getIdentity())->tryAllocate(request)) + if(getImpl((*q)->ice_getIdentity())->tryAllocate(request)) { return; } diff --git a/cpp/src/IceGrid/icegridregistry.dsp b/cpp/src/IceGrid/icegridregistry.dsp index 7891ead7638..656a7669b1b 100755 --- a/cpp/src/IceGrid/icegridregistry.dsp +++ b/cpp/src/IceGrid/icegridregistry.dsp @@ -205,6 +205,10 @@ SOURCE=.\TraceLevels.cpp SOURCE=.\Util.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\WaitQueue.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
|