3 files changed, 9 insertions, 7 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index be44fef9fe0..116efe08a7e 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -6,7 +6,7 @@ Changes since version 3.0.1
   to be set during communicator creation. Currently included are
   Properties, Logger, Stats and default context. The initializeWith 
   communicator initialization functions have been deprecated and the 
-  setLogge()r, setStats() and setDefaultContext() methods have been 
+  setLogger(), setStats() and setDefaultContext() methods have been 
   removed.
 
 - Added the new slice metadata, "deprecate" which can be used to
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;
 };
 
 }