Renamed namespace back to Ice

1 files changed, 11 insertions, 11 deletions

diff --git a/cppe/src/IceE/RoutingTable.cpp b/cppe/src/IceE/RoutingTable.cpp
index dd4b24ed322..f5fadca71eb 100644
--- a/cppe/src/IceE/RoutingTable.cpp
+++ b/cppe/src/IceE/RoutingTable.cpp
@@ -15,28 +15,28 @@
 #include <IceE/Proxy.h>
 
 using namespace std;
-using namespace IceE;
-using namespace IceEInternal;
+using namespace Ice;
+using namespace IceInternal;
 
-void IceEInternal::incRef(RoutingTable* p) { p->__incRef(); }
-void IceEInternal::decRef(RoutingTable* p) { p->__decRef(); }
+void IceInternal::incRef(RoutingTable* p) { p->__incRef(); }
+void IceInternal::decRef(RoutingTable* p) { p->__decRef(); }
 
-IceEInternal::RoutingTable::RoutingTable() :
+IceInternal::RoutingTable::RoutingTable() :
     _tableHint(_table.end())
 {
 }
 
 void
-IceEInternal::RoutingTable::clear()
+IceInternal::RoutingTable::clear()
 {
-    IceE::Mutex::Lock sync(*this);
+    Ice::Mutex::Lock sync(*this);
 
     _table.clear();
     _tableHint = _table.end();
 }
 
 bool
-IceEInternal::RoutingTable::add(const ObjectPrx& prx)
+IceInternal::RoutingTable::add(const ObjectPrx& prx)
 {
     if(!prx)
     {
@@ -45,7 +45,7 @@ IceEInternal::RoutingTable::add(const ObjectPrx& prx)
 
     ObjectPrx proxy = prx->ice_default(); // We insert the proxy in its default form into the routing table.
 
-    IceE::Mutex::Lock sync(*this);
+    Ice::Mutex::Lock sync(*this);
 
     map<Identity, ObjectPrx>::iterator p = _table.end();
     
@@ -74,14 +74,14 @@ IceEInternal::RoutingTable::add(const ObjectPrx& prx)
 }
 
 ObjectPrx
-IceEInternal::RoutingTable::get(const Identity& ident)
+IceInternal::RoutingTable::get(const Identity& ident)
 {
     if(ident.name.empty())
     {
 	return 0;
     }
 
-    IceE::Mutex::Lock sync(*this);
+    Ice::Mutex::Lock sync(*this);
 
     map<Identity, ObjectPrx>::iterator p = _table.end();