summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/RouterInfo.cpp10
-rw-r--r--cpp/src/Ice/RouterInfo.h4
2 files changed, 8 insertions, 6 deletions
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index c842636a18d..c426735b85d 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -123,7 +123,7 @@ IceInternal::RouterInfo::destroy()
_clientProxy = 0;
_serverProxy = 0;
_adapter = 0;
- _map.clear();
+ _identities.clear();
}
bool
@@ -241,9 +241,9 @@ IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy)
IceUtil::Mutex::Lock sync(*this);
- map<Identity, int>::iterator p = _map.find(proxy->ice_getIdentity());
+ set<Identity>::iterator p = _identities.find(proxy->ice_getIdentity());
- if(p == _map.end())
+ if(p == _identities.end())
{
//
// Only add the proxy to the router if it's not already in our local map.
@@ -255,14 +255,14 @@ IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy)
//
// If we successfully added the proxy to the router, we add it to our local map.
//
- _map.insert(_map.begin(), pair<const Identity, int>(proxy->ice_getIdentity(), 0));
+ _identities.insert(_identities.begin(), proxy->ice_getIdentity());
//
// We also must remove whatever proxies the router evicted.
//
for(ObjectProxySeq::iterator q = evictedProxies.begin(); q != evictedProxies.end(); ++q)
{
- _map.erase((*q)->ice_getIdentity());
+ _identities.erase((*q)->ice_getIdentity());
}
}
}
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 46f244e8a15..71d885cb394 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -16,6 +16,8 @@
#include <Ice/RouterF.h>
#include <Ice/ProxyF.h>
+#include <set>
+
namespace IceInternal
{
@@ -67,7 +69,7 @@ private:
Ice::ObjectPrx _clientProxy;
Ice::ObjectPrx _serverProxy;
Ice::ObjectAdapterPtr _adapter;
- std::map<Ice::Identity, int> _map;
+ std::set<Ice::Identity> _identities;
};
}