BasicStream; Stream.ice

33 files changed, 411 insertions, 226 deletions

diff --git a/cpp/src/Freeze/.depend b/cpp/src/Freeze/.depend
index 15a37f93f04..e0a85d307c5 100644
--- a/cpp/src/Freeze/.depend
+++ b/cpp/src/Freeze/.depend
@@ -1,6 +1,6 @@
-DB.o: DB.cpp ../../include/Freeze/DB.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h
-DBException.o: DBException.cpp ../../include/Freeze/DBException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h
-Evictor.o: Evictor.cpp ../../include/Freeze/Evictor.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h
-DBI.o: DBI.cpp ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Freeze/DBException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../Freeze/DBI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Freeze/DB.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../Freeze/EvictorI.h ../../include/Freeze/Evictor.h ../../include/Freeze/Initialize.h
-EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../../include/Freeze/DB.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h
-Application.o: Application.cpp ../../include/Freeze/Application.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h
+DB.o: DB.cpp ../../include/Freeze/DB.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h
+DBException.o: DBException.cpp ../../include/Freeze/DBException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h
+Evictor.o: Evictor.cpp ../../include/Freeze/Evictor.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h
+DBI.o: DBI.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Freeze/DBException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../Freeze/DBI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Freeze/DB.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../Freeze/EvictorI.h ../../include/Freeze/Evictor.h ../../include/Freeze/Initialize.h
+EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../../include/Freeze/DB.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h
+Application.o: Application.cpp ../../include/Freeze/Application.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h
diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index ded8e38129c..46a1c4c5eb9 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-#include <Ice/IntStream.h> // Not included in Ice/Ice.h
+#include <Ice/BasicStream.h> // Not included in Ice/Ice.h
 #include <Freeze/DBException.h>
 #include <Freeze/DBI.h>
 #include <Freeze/EvictorI.h>
@@ -466,7 +466,7 @@ Freeze::DBI::putServant(const string& identity, const ObjectPtr& servant)
     }
 
     IceInternal::InstancePtr instance = IceInternal::getInstance(_communicator);
-    IceInternal::IntStream stream(instance);
+    IceInternal::BasicStream stream(instance);
     stream.write(servant);
 
     DBT dbKey, dbData;
@@ -517,7 +517,7 @@ Freeze::DBI::getServant(const string& identity)
     checkBerkeleyDBReturn(_db->get(_db, 0, &dbKey, &dbData, 0), _errorPrefix, "DB->get");
 
     IceInternal::InstancePtr instance = IceInternal::getInstance(_communicator);
-    IceInternal::IntStream stream(instance);
+    IceInternal::BasicStream stream(instance);
     stream.b.resize(dbData.size);
     copy(static_cast<Byte*>(dbData.data), static_cast<Byte*>(dbData.data) + dbData.size, stream.b.begin());
     stream.i = stream.b.begin();
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index df102ea110a..48ca11fb8b7 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -1,35 +1,37 @@
-Application.o: Application.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h
-IntStream.o: IntStream.cpp ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../../include/Ice/ServantFactory.h ../Ice/ServantFactoryManager.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/LocalException.h
+Application.o: Application.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h
 LocalException.o: LocalException.cpp ../../include/Ice/LocalException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/Network.h
-Properties.o: Properties.cpp ../../include/Ice/Properties.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
+Properties.o: Properties.cpp ../../include/Ice/Properties.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
 PropertiesI.o: PropertiesI.cpp ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LocalException.h
-Logger.o: Logger.cpp ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
+Logger.o: Logger.cpp ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
 LoggerI.o: LoggerI.cpp ../Ice/LoggerI.h ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
+Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
+StreamI.o: StreamI.cpp ../Ice/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
+BasicStream.o: BasicStream.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../../include/Ice/ServantFactory.h ../Ice/ServantFactoryManager.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/LocalException.h
 SysLoggerI.o: SysLoggerI.cpp ../Ice/SysLoggerI.h ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
 TraceLevels.o: TraceLevels.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/Properties.h
-TraceUtil.o: TraceUtil.cpp ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../Ice/Protocol.h
-Instance.o: Instance.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../Ice/EventHandlerF.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/EndpointF.h ../Ice/EventHandler.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../Ice/ServantFactoryManager.h ../../include/Ice/ServantFactoryF.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/SysLoggerI.h
-Communicator.o: Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
-CommunicatorI.o: CommunicatorI.cpp ../Ice/CommunicatorI.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ServantFactoryF.h ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../Ice/EventHandlerF.h ../Ice/ServantFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../../include/Ice/Logger.h
-ObjectAdapter.o: ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
-ObjectAdapterI.o: ObjectAdapterI.cpp ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Collector.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
+TraceUtil.o: TraceUtil.cpp ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Protocol.h
+Instance.o: Instance.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../Ice/EventHandlerF.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/EndpointF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/ServantFactoryManager.h ../../include/Ice/ServantFactoryF.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/SysLoggerI.h
+Communicator.o: Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
+CommunicatorI.o: CommunicatorI.cpp ../Ice/CommunicatorI.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../Ice/EventHandlerF.h ../Ice/ServantFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../../include/Ice/Logger.h ../Ice/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
+ObjectAdapter.o: ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
+ObjectAdapterI.o: ObjectAdapterI.cpp ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Collector.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
 ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h
-ServantFactory.o: ServantFactory.cpp ../../include/Ice/ServantFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
+ServantFactory.o: ServantFactory.cpp ../../include/Ice/ServantFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
 ServantFactoryManager.o: ServantFactoryManager.cpp ../Ice/ServantFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/ServantFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
-Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/UdpTransceiver.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
-Reference.o: Reference.cpp ../Ice/Reference.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/IntStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
+Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/UdpTransceiver.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
+Reference.o: Reference.cpp ../Ice/Reference.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
 LocalObject.o: LocalObject.cpp ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h
-Object.o: Object.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/InstanceF.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h
-ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h
-Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Direct.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
-Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../../include/Ice/LocalException.h
-Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/LocalException.h
+Object.o: Object.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
+ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
+Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../../include/Ice/LocalException.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Direct.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
+Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../../include/Ice/LocalException.h
+Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/LocalException.h
 Direct.o: Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ReferenceF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../Ice/Reference.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../../include/Ice/LocalException.h
-Emitter.o: Emitter.cpp ../Ice/Emitter.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ThreadPool.h ../Ice/Endpoint.h ../Ice/AcceptorF.h ../../include/Ice/Outgoing.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h ../Ice/Protocol.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
-Collector.o: Collector.cpp ../Ice/Collector.h ../../include/Ice/CollectorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/AcceptorF.h ../Ice/ThreadPoolF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Logger.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../../include/Ice/ObjectAdapter.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../../include/Ice/Incoming.h ../../include/Ice/LocalException.h ../Ice/Protocol.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
+Emitter.o: Emitter.cpp ../Ice/Emitter.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ThreadPool.h ../Ice/Endpoint.h ../Ice/AcceptorF.h ../../include/Ice/Outgoing.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h ../Ice/Protocol.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
+Collector.o: Collector.cpp ../Ice/Collector.h ../../include/Ice/CollectorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/AcceptorF.h ../Ice/ThreadPoolF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Logger.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../../include/Ice/ObjectAdapter.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../../include/Ice/Incoming.h ../../include/Ice/LocalException.h ../Ice/Protocol.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
 Network.o: Network.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/LocalException.h ../../include/IceUtil/Exception.h
-ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/IntStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CollectorF.h
-EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/IntStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
+ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CollectorF.h
+EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ServantFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
 Connector.o: Connector.cpp ../Ice/Connector.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ConnectorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/TransceiverF.h
 Acceptor.o: Acceptor.cpp ../Ice/Acceptor.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/AcceptorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/TransceiverF.h
 Transceiver.o: Transceiver.cpp ../Ice/Transceiver.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h
diff --git a/cpp/src/Ice/IntStream.cpp b/cpp/src/Ice/BasicStream.cpp
index e3e5ab15091..25e0805425b 100644
--- a/cpp/src/Ice/IntStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 #include <Ice/Instance.h>
 #include <Ice/Object.h>
 #include <Ice/Proxy.h>
@@ -21,7 +21,7 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-IceInternal::IntStream::IntStream(const InstancePtr& instance) :
+IceInternal::BasicStream::BasicStream(const InstancePtr& instance) :
     _instance(instance),
     _encapsStack(1)
 {
@@ -30,7 +30,7 @@ IceInternal::IntStream::IntStream(const InstancePtr& instance) :
     _encapsStack.back().encoding = 0;
 }
 
-IceInternal::IntStream::~IntStream()
+IceInternal::BasicStream::~BasicStream()
 {
     //
     // No check for exactly one, because an error might have aborted
@@ -40,13 +40,13 @@ IceInternal::IntStream::~IntStream()
 }
 
 InstancePtr
-IceInternal::IntStream::instance() const
+IceInternal::BasicStream::instance() const
 {
     return _instance;
 }
 
 void
-IceInternal::IntStream::swap(IntStream& other)
+IceInternal::BasicStream::swap(BasicStream& other)
 {
     assert(_instance.get() == other._instance.get());
 
@@ -56,7 +56,7 @@ IceInternal::IntStream::swap(IntStream& other)
 }
 
 void
-IceInternal::IntStream::resize(int total)
+IceInternal::BasicStream::resize(int total)
 {
     if (total > 1024 * 1024) // TODO: configurable
     {
@@ -66,7 +66,7 @@ IceInternal::IntStream::resize(int total)
 }
 
 void
-IceInternal::IntStream::reserve(int total)
+IceInternal::BasicStream::reserve(int total)
 {
     if (total > 1024 * 1024) // TODO: configurable
     {
@@ -76,7 +76,7 @@ IceInternal::IntStream::reserve(int total)
 }
 
 void
-IceInternal::IntStream::startWriteEncaps()
+IceInternal::BasicStream::startWriteEncaps()
 {
     write(Int(0)); // Placeholder for the encapsulation length
     _encapsStack.resize(_encapsStack.size() + 1);
@@ -86,7 +86,7 @@ IceInternal::IntStream::startWriteEncaps()
 }
 
 void
-IceInternal::IntStream::endWriteEncaps()
+IceInternal::BasicStream::endWriteEncaps()
 {
     int start = _encapsStack.back().start;
     _encapsStack.pop_back();
@@ -100,7 +100,7 @@ IceInternal::IntStream::endWriteEncaps()
 }
 
 void
-IceInternal::IntStream::startReadEncaps()
+IceInternal::BasicStream::startReadEncaps()
 {
     Int sz;
     read(sz);
@@ -114,7 +114,7 @@ IceInternal::IntStream::startReadEncaps()
 }
 
 void
-IceInternal::IntStream::endReadEncaps()
+IceInternal::BasicStream::endReadEncaps()
 {
     int start = _encapsStack.back().start;
     _encapsStack.pop_back();
@@ -130,7 +130,7 @@ IceInternal::IntStream::endReadEncaps()
 }
 
 void
-IceInternal::IntStream::skipEncaps()
+IceInternal::BasicStream::skipEncaps()
 {
     Int sz;
     read(sz);
@@ -142,7 +142,7 @@ IceInternal::IntStream::skipEncaps()
 }
 
 void
-IceInternal::IntStream::write(const vector<Byte>& v)
+IceInternal::BasicStream::write(const vector<Byte>& v)
 {
     int pos = b.size();
     Int sz = v.size();
@@ -157,7 +157,7 @@ IceInternal::IntStream::write(const vector<Byte>& v)
 }
 
 void
-IceInternal::IntStream::read(Byte& v)
+IceInternal::BasicStream::read(Byte& v)
 {
     if (i >= b.end())
     {
@@ -167,7 +167,7 @@ IceInternal::IntStream::read(Byte& v)
 }
 
 void
-IceInternal::IntStream::read(vector<Byte>& v)
+IceInternal::BasicStream::read(vector<Byte>& v)
 {
     Int sz;
     read(sz);
@@ -182,7 +182,7 @@ IceInternal::IntStream::read(vector<Byte>& v)
 }
 
 void
-IceInternal::IntStream::write(const vector<bool>& v)
+IceInternal::BasicStream::write(const vector<bool>& v)
 {
     int pos = b.size();
     Int sz = v.size();
@@ -197,7 +197,7 @@ IceInternal::IntStream::write(const vector<bool>& v)
 }
 
 void
-IceInternal::IntStream::read(bool& v)
+IceInternal::BasicStream::read(bool& v)
 {
     if (i >= b.end())
     {
@@ -207,7 +207,7 @@ IceInternal::IntStream::read(bool& v)
 }
 
 void
-IceInternal::IntStream::read(vector<bool>& v)
+IceInternal::BasicStream::read(vector<bool>& v)
 {
     Int sz;
     read(sz);
@@ -222,7 +222,7 @@ IceInternal::IntStream::read(vector<bool>& v)
 }
 
 void
-IceInternal::IntStream::write(Short v)
+IceInternal::BasicStream::write(Short v)
 {
     int pos = b.size();
     resize(pos + sizeof(Short));
@@ -235,7 +235,7 @@ IceInternal::IntStream::write(Short v)
 }
 
 void
-IceInternal::IntStream::write(const vector<Short>& v)
+IceInternal::BasicStream::write(const vector<Short>& v)
 {
     int pos = b.size();
     Int sz = v.size();
@@ -259,7 +259,7 @@ IceInternal::IntStream::write(const vector<Short>& v)
 }
 
 void
-IceInternal::IntStream::read(Short& v)
+IceInternal::BasicStream::read(Short& v)
 {
     Container::iterator begin = i;
     i += sizeof(Short);
@@ -275,7 +275,7 @@ IceInternal::IntStream::read(Short& v)
 }
 
 void
-IceInternal::IntStream::read(vector<Short>& v)
+IceInternal::BasicStream::read(vector<Short>& v)
 {
     Int sz;
     read(sz);
@@ -298,7 +298,7 @@ IceInternal::IntStream::read(vector<Short>& v)
 }
 
 void
-IceInternal::IntStream::write(Int v)
+IceInternal::BasicStream::write(Int v)
 {
     int pos = b.size();
     resize(pos + sizeof(Int));
@@ -311,7 +311,7 @@ IceInternal::IntStream::write(Int v)
 }
 
 void
-IceInternal::IntStream::write(const vector<Int>& v)
+IceInternal::BasicStream::write(const vector<Int>& v)
 {
     int pos = b.size();
     Int sz = v.size();
@@ -335,7 +335,7 @@ IceInternal::IntStream::write(const vector<Int>& v)
 }
 
 void
-IceInternal::IntStream::read(Int& v)
+IceInternal::BasicStream::read(Int& v)
 {
     Container::iterator begin = i;
     i += sizeof(Int);
@@ -351,7 +351,7 @@ IceInternal::IntStream::read(Int& v)
 }
 
 void
-IceInternal::IntStream::read(vector<Int>& v)
+IceInternal::BasicStream::read(vector<Int>& v)
 {
     Int sz;
     read(sz);
@@ -374,7 +374,7 @@ IceInternal::IntStream::read(vector<Int>& v)
 }
 
 void
-IceInternal::IntStream::write(Long v)
+IceInternal::BasicStream::write(Long v)
 {
     int pos = b.size();
     resize(pos + sizeof(Long));
@@ -387,7 +387,7 @@ IceInternal::IntStream::write(Long v)
 }
 
 void
-IceInternal::IntStream::write(const vector<Long>& v)
+IceInternal::BasicStream::write(const vector<Long>& v)
 {
     int pos = b.size();
     Int sz = v.size();
@@ -411,7 +411,7 @@ IceInternal::IntStream::write(const vector<Long>& v)
 }
 
 void
-IceInternal::IntStream::read(Long& v)
+IceInternal::BasicStream::read(Long& v)
 {
     Container::iterator begin = i;
     i += sizeof(Long);
@@ -427,7 +427,7 @@ IceInternal::IntStream::read(Long& v)
 }
 
 void
-IceInternal::IntStream::read(vector<Long>& v)
+IceInternal::BasicStream::read(vector<Long>& v)
 {
     Int sz;
     read(sz);
@@ -450,7 +450,7 @@ IceInternal::IntStream::read(vector<Long>& v)
 }
 
 void
-IceInternal::IntStream::write(Float v)
+IceInternal::BasicStream::write(Float v)
 {
     int pos = b.size();
     resize(pos + sizeof(Float));
@@ -463,7 +463,7 @@ IceInternal::IntStream::write(Float v)
 }
 
 void
-IceInternal::IntStream::write(const vector<Float>& v)
+IceInternal::BasicStream::write(const vector<Float>& v)
 {
     int pos = b.size();
     Int sz = v.size();
@@ -487,7 +487,7 @@ IceInternal::IntStream::write(const vector<Float>& v)
 }
 
 void
-IceInternal::IntStream::read(Float& v)
+IceInternal::BasicStream::read(Float& v)
 {
     Container::iterator begin = i;
     i += sizeof(Float);
@@ -503,7 +503,7 @@ IceInternal::IntStream::read(Float& v)
 }
 
 void
-IceInternal::IntStream::read(vector<Float>& v)
+IceInternal::BasicStream::read(vector<Float>& v)
 {
     Int sz;
     read(sz);
@@ -526,7 +526,7 @@ IceInternal::IntStream::read(vector<Float>& v)
 }
 
 void
-IceInternal::IntStream::write(Double v)
+IceInternal::BasicStream::write(Double v)
 {
     int pos = b.size();
     resize(pos + sizeof(Double));
@@ -539,7 +539,7 @@ IceInternal::IntStream::write(Double v)
 }
 
 void
-IceInternal::IntStream::write(const vector<Double>& v)
+IceInternal::BasicStream::write(const vector<Double>& v)
 {
     int pos = b.size();
     Int sz = v.size();
@@ -563,7 +563,7 @@ IceInternal::IntStream::write(const vector<Double>& v)
 }
 
 void
-IceInternal::IntStream::read(Double& v)
+IceInternal::BasicStream::read(Double& v)
 {
     Container::iterator begin = i;
     i += sizeof(Double);
@@ -579,7 +579,7 @@ IceInternal::IntStream::read(Double& v)
 }
 
 void
-IceInternal::IntStream::read(vector<Double>& v)
+IceInternal::BasicStream::read(vector<Double>& v)
 {
     Int sz;
     read(sz);
@@ -602,7 +602,7 @@ IceInternal::IntStream::read(vector<Double>& v)
 }
 
 void
-IceInternal::IntStream::write(const string& v)
+IceInternal::BasicStream::write(const string& v)
 {
     map<string, Int>::const_iterator p = _encapsStack.back().stringsWritten.find(v);
     if (p != _encapsStack.back().stringsWritten.end())
@@ -622,13 +622,13 @@ IceInternal::IntStream::write(const string& v)
 }
 
 void
-IceInternal::IntStream::write(const char* v)
+IceInternal::BasicStream::write(const char* v)
 {
     write(string(v));
 }
 
 void
-IceInternal::IntStream::write(const vector<string>& v)
+IceInternal::BasicStream::write(const vector<string>& v)
 {
     write(Int(v.size()));
     vector<string>::const_iterator p;
@@ -639,7 +639,7 @@ IceInternal::IntStream::write(const vector<string>& v)
 }
 
 void
-IceInternal::IntStream::read(string& v)
+IceInternal::BasicStream::read(string& v)
 {
     Int idx;
     read(idx);
@@ -673,7 +673,7 @@ IceInternal::IntStream::read(string& v)
 }
 
 void
-IceInternal::IntStream::read(vector<string>& v)
+IceInternal::BasicStream::read(vector<string>& v)
 {
     Int sz;
     read(sz);
@@ -691,7 +691,7 @@ IceInternal::IntStream::read(vector<string>& v)
 }
 
 void
-IceInternal::IntStream::write(const wstring& v)
+IceInternal::BasicStream::write(const wstring& v)
 {
     map<wstring, Int>::const_iterator p = _encapsStack.back().wstringsWritten.find(v);
     if (p != _encapsStack.back().wstringsWritten.end())
@@ -713,7 +713,7 @@ IceInternal::IntStream::write(const wstring& v)
 }
 
 void
-IceInternal::IntStream::write(const vector<wstring>& v)
+IceInternal::BasicStream::write(const vector<wstring>& v)
 {
     write(Int(v.size()));
     vector<wstring>::const_iterator p;
@@ -724,7 +724,7 @@ IceInternal::IntStream::write(const vector<wstring>& v)
 }
 
 void
-IceInternal::IntStream::read(wstring& v)
+IceInternal::BasicStream::read(wstring& v)
 {
     Int idx;
     read(idx);
@@ -759,13 +759,13 @@ IceInternal::IntStream::read(wstring& v)
 }
 
 void
-IceInternal::IntStream::write(const wchar_t* v)
+IceInternal::BasicStream::write(const wchar_t* v)
 {
     write(wstring(v));
 }
 
 void
-IceInternal::IntStream::read(vector<wstring>& v)
+IceInternal::BasicStream::read(vector<wstring>& v)
 {
     Int sz;
     read(sz);
@@ -783,19 +783,19 @@ IceInternal::IntStream::read(vector<wstring>& v)
 }
 
 void
-IceInternal::IntStream::write(const ObjectPrx& v)
+IceInternal::BasicStream::write(const ObjectPrx& v)
 {
     _instance->proxyFactory()->proxyToStream(v, this);
 }
 
 void
-IceInternal::IntStream::read(ObjectPrx& v)
+IceInternal::BasicStream::read(ObjectPrx& v)
 {
     v = _instance->proxyFactory()->streamToProxy(this);
 }
 
 void
-IceInternal::IntStream::write(const ObjectPtr& v)
+IceInternal::BasicStream::write(const ObjectPtr& v)
 {
     const string* classIds = v->_classIds();
     Int sz = 0;
@@ -812,7 +812,7 @@ IceInternal::IntStream::write(const ObjectPtr& v)
 }
 
 void
-IceInternal::IntStream::read(ObjectPtr& v, const string& type)
+IceInternal::BasicStream::read(ObjectPtr& v, const string& type)
 {
     vector<string> classIds;
     read(classIds);
diff --git a/cpp/src/Ice/Collector.cpp b/cpp/src/Ice/Collector.cpp
index a7e75c70c90..63c25b1e14d 100644
--- a/cpp/src/Ice/Collector.cpp
+++ b/cpp/src/Ice/Collector.cpp
@@ -73,16 +73,16 @@ IceInternal::Collector::readable() const
 }
 
 void
-IceInternal::Collector::read(IntStream& stream)
+IceInternal::Collector::read(BasicStream& stream)
 {
     _transceiver->read(stream, 0);
 }
 
 void
-IceInternal::Collector::message(IntStream& stream)
+IceInternal::Collector::message(BasicStream& stream)
 {
     Incoming in(_instance, _adapter);
-    IntStream* os = in.os();
+    BasicStream* os = in.os();
     bool invoke = false;
     bool batch = false;
     bool response = false;
@@ -442,7 +442,7 @@ IceInternal::Collector::setState(State state)
 void
 IceInternal::Collector::closeConnection()
 {
-    IntStream os(_instance);
+    BasicStream os(_instance);
     os.write(protocolVersion);
     os.write(encodingVersion);
     os.write(closeConnectionMsg);
@@ -518,13 +518,13 @@ IceInternal::CollectorFactory::readable() const
 }
 
 void
-IceInternal::CollectorFactory::read(IntStream&)
+IceInternal::CollectorFactory::read(BasicStream&)
 {
     assert(false); // Must not be called
 }
 
 void
-IceInternal::CollectorFactory::message(IntStream&)
+IceInternal::CollectorFactory::message(BasicStream&)
 {
     JTCSyncT<JTCMutex> sync(*this);
 
diff --git a/cpp/src/Ice/Collector.h b/cpp/src/Ice/Collector.h
index 96af9f842aa..0801abf3c1e 100644
--- a/cpp/src/Ice/Collector.h
+++ b/cpp/src/Ice/Collector.h
@@ -59,8 +59,8 @@ public:
     //
     virtual bool server() const;
     virtual bool readable() const;
-    virtual void read(IntStream&);
-    virtual void message(IntStream&);
+    virtual void read(BasicStream&);
+    virtual void message(BasicStream&);
     virtual void exception(const ::Ice::LocalException&);
     virtual void finished();
     virtual bool tryDestroy();
@@ -109,8 +109,8 @@ public:
     //
     virtual bool server() const;
     virtual bool readable() const;
-    virtual void read(IntStream&);
-    virtual void message(IntStream&);
+    virtual void read(BasicStream&);
+    virtual void message(BasicStream&);
     virtual void exception(const ::Ice::LocalException&);
     virtual void finished();
     virtual bool tryDestroy();
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index e4b9eaf7b8e..38f42823175 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -16,6 +16,7 @@
 #include <Ice/ServantFactoryManager.h>
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/Logger.h>
+#include <Ice/StreamI.h>
 #include <Ice/Initialize.h>
 #include <Ice/LocalException.h>
 
@@ -167,6 +168,18 @@ Ice::CommunicatorI::setLogger(const LoggerPtr& logger)
     _instance->logger(logger);
 }
 
+StreamPtr
+Ice::CommunicatorI::createStream()
+{
+    JTCSyncT<JTCRecursiveMutex> sync(*this);
+    if (!_instance)
+    {
+	throw CommunicatorDestroyedException(__FILE__, __LINE__);
+    }
+
+    return new StreamI(_instance);
+}
+
 Ice::CommunicatorI::CommunicatorI(const PropertiesPtr& properties)
 {
     __setNoDelete(true);
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index f9b4be98b9d..78e4493e426 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -41,6 +41,8 @@ public:
     virtual LoggerPtr getLogger();
     virtual void setLogger(const LoggerPtr&);
 
+    virtual StreamPtr createStream();
+
 private:
 
     CommunicatorI(const PropertiesPtr&);
diff --git a/cpp/src/Ice/Emitter.cpp b/cpp/src/Ice/Emitter.cpp
index e0abf451614..709f2dc56e1 100644
--- a/cpp/src/Ice/Emitter.cpp
+++ b/cpp/src/Ice/Emitter.cpp
@@ -49,7 +49,7 @@ IceInternal::Emitter::destroyed() const
 void
 IceInternal::Emitter::prepareRequest(Outgoing* out)
 {
-    IntStream* os = out->os();
+    BasicStream* os = out->os();
     os->write(protocolVersion);
     os->write(encodingVersion);
     os->write(requestMsg);
@@ -72,7 +72,7 @@ IceInternal::Emitter::sendRequest(Outgoing* out, bool oneway)
 
     try
     {
-	IntStream* os = out->os();
+	BasicStream* os = out->os();
 	os->i = os->b.begin();
 	
 	//
@@ -199,7 +199,7 @@ IceInternal::Emitter::flushBatchRequest()
 	// Reset _batchStream and _batchRequestId, so that new batch
 	// messages can be sent.
 	//
-	IntStream dummy(_instance);
+	BasicStream dummy(_instance);
 	_batchStream.swap(dummy);
 	assert(_batchStream.b.empty());
     }
@@ -229,13 +229,13 @@ IceInternal::Emitter::readable() const
 }
 
 void
-IceInternal::Emitter::read(IntStream& stream)
+IceInternal::Emitter::read(BasicStream& stream)
 {
     _transceiver->read(stream, 0);
 }
 
 void
-IceInternal::Emitter::message(IntStream& stream)
+IceInternal::Emitter::message(BasicStream& stream)
 {
     JTCSyncT<JTCMutex> sync(*this);
 
diff --git a/cpp/src/Ice/Emitter.h b/cpp/src/Ice/Emitter.h
index df102c6d341..d12c5330fc5 100644
--- a/cpp/src/Ice/Emitter.h
+++ b/cpp/src/Ice/Emitter.h
@@ -59,8 +59,8 @@ public:
     //
     virtual bool server() const;
     virtual bool readable() const;
-    virtual void read(IntStream&);
-    virtual void message(IntStream&);
+    virtual void read(BasicStream&);
+    virtual void message(BasicStream&);
     virtual void exception(const ::Ice::LocalException&);
     virtual void finished();
     virtual bool tryDestroy();
@@ -89,7 +89,7 @@ private:
     ::Ice::Int _nextRequestId;
     std::map< ::Ice::Int, Outgoing*> _requests;
     std::auto_ptr< ::Ice::LocalException> _exception;
-    IntStream _batchStream;
+    BasicStream _batchStream;
     State _state;
 };
 
diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index 47a303b332d..f6bf95f159c 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -17,7 +17,7 @@
 #include <Ice/SslConnector.h>
 #include <Ice/SslTransceiver.h>
 #include <Ice/UdpTransceiver.h>
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 
 using namespace std;
@@ -66,7 +66,7 @@ IceInternal::Endpoint::endpointFromString(const string& str)
 }
 
 void
-IceInternal::Endpoint::streamRead(IntStream* s, EndpointPtr& v)
+IceInternal::Endpoint::streamRead(BasicStream* s, EndpointPtr& v)
 {
     Short type;
     s->read(type);
@@ -99,13 +99,13 @@ IceInternal::Endpoint::streamRead(IntStream* s, EndpointPtr& v)
     }
 }
 
-IceInternal::UnknownEndpoint::UnknownEndpoint(IntStream* s)
+IceInternal::UnknownEndpoint::UnknownEndpoint(BasicStream* s)
 {
     s->read(const_cast<vector<Byte>&>(_rawBytes));
 }
 
 void
-IceInternal::UnknownEndpoint::streamWrite(IntStream* s) const
+IceInternal::UnknownEndpoint::streamWrite(BasicStream* s) const
 {
     s->write(UnknownEndpointType);
     s->write(_rawBytes);
@@ -326,7 +326,7 @@ IceInternal::TcpEndpoint::TcpEndpoint(const string& str) :
     }
 }
 
-IceInternal::TcpEndpoint::TcpEndpoint(IntStream* s) :
+IceInternal::TcpEndpoint::TcpEndpoint(BasicStream* s) :
     _port(0),
     _timeout(-1)
 {
@@ -338,7 +338,7 @@ IceInternal::TcpEndpoint::TcpEndpoint(IntStream* s) :
 }
 
 void
-IceInternal::TcpEndpoint::streamWrite(IntStream* s) const
+IceInternal::TcpEndpoint::streamWrite(BasicStream* s) const
 {
     s->write(TcpEndpointType);
     s->startWriteEncaps();
@@ -641,7 +641,7 @@ IceInternal::SslEndpoint::SslEndpoint(const string& str) :
     }
 }
 
-IceInternal::SslEndpoint::SslEndpoint(IntStream* s) :
+IceInternal::SslEndpoint::SslEndpoint(BasicStream* s) :
     _port(0),
     _timeout(-1)
 {
@@ -653,7 +653,7 @@ IceInternal::SslEndpoint::SslEndpoint(IntStream* s) :
 }
 
 void
-IceInternal::SslEndpoint::streamWrite(IntStream* s) const
+IceInternal::SslEndpoint::streamWrite(BasicStream* s) const
 {
     s->write(SslEndpointType);
     s->startWriteEncaps();
@@ -948,7 +948,7 @@ IceInternal::UdpEndpoint::UdpEndpoint(const string& str) :
     }
 }
 
-IceInternal::UdpEndpoint::UdpEndpoint(IntStream* s) :
+IceInternal::UdpEndpoint::UdpEndpoint(BasicStream* s) :
     _port(0)
 {
     s->startReadEncaps();
@@ -958,7 +958,7 @@ IceInternal::UdpEndpoint::UdpEndpoint(IntStream* s) :
 }
 
 void
-IceInternal::UdpEndpoint::streamWrite(IntStream* s) const
+IceInternal::UdpEndpoint::streamWrite(BasicStream* s) const
 {
     s->write(UdpEndpointType);
     s->startWriteEncaps();
diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h
index b736c7952b3..d3374b53b4c 100644
--- a/cpp/src/Ice/Endpoint.h
+++ b/cpp/src/Ice/Endpoint.h
@@ -21,7 +21,7 @@
 namespace IceInternal
 {
 
-class IntStream;
+class BasicStream;
 
 const ::Ice::Short UnknownEndpointType = 0;
 const ::Ice::Short TcpEndpointType = 1;
@@ -42,12 +42,12 @@ public:
     //
     // Unmarshal an endpoint
     //
-    static void streamRead(IntStream*, EndpointPtr&);
+    static void streamRead(BasicStream*, EndpointPtr&);
     
     //
     // Marshal the endpoint
     //
-    virtual void streamWrite(IntStream*) const = 0;
+    virtual void streamWrite(BasicStream*) const = 0;
 
     //
     // Convert the endpoint to its string form
@@ -135,9 +135,9 @@ class UnknownEndpoint : public Endpoint
 {
 public:
 
-    UnknownEndpoint(IntStream*);
+    UnknownEndpoint(BasicStream*);
 
-    virtual void streamWrite(IntStream*) const;
+    virtual void streamWrite(BasicStream*) const;
     virtual std::string toString() const;
     virtual ::Ice::Short type() const;
     virtual bool oneway() const;
@@ -169,9 +169,9 @@ public:
 
     TcpEndpoint(const std::string&, ::Ice::Int, ::Ice::Int);
     TcpEndpoint(const std::string&);
-    TcpEndpoint(IntStream*);
+    TcpEndpoint(BasicStream*);
 
-    virtual void streamWrite(IntStream*) const;
+    virtual void streamWrite(BasicStream*) const;
     virtual std::string toString() const;
     virtual ::Ice::Short type() const;
     virtual bool oneway() const;
@@ -205,9 +205,9 @@ public:
 
     SslEndpoint(const std::string&, ::Ice::Int, ::Ice::Int);
     SslEndpoint(const std::string&);
-    SslEndpoint(IntStream*);
+    SslEndpoint(BasicStream*);
 
-    virtual void streamWrite(IntStream*) const;
+    virtual void streamWrite(BasicStream*) const;
     virtual std::string toString() const;
     virtual ::Ice::Short type() const;
     virtual bool oneway() const;
@@ -241,9 +241,9 @@ public:
 
     UdpEndpoint(const std::string&, ::Ice::Int);
     UdpEndpoint(const std::string&);
-    UdpEndpoint(IntStream*);
+    UdpEndpoint(BasicStream*);
 
-    virtual void streamWrite(IntStream*) const;
+    virtual void streamWrite(BasicStream*) const;
     virtual std::string toString() const;
     virtual ::Ice::Short type() const;
     virtual bool oneway() const;
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index fcfc1336e5b..3b788daaee7 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -15,7 +15,7 @@
 #include <Ice/EventHandlerF.h>
 #include <Ice/InstanceF.h>
 #include <Ice/ThreadPoolF.h>
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 
 namespace IceUtil
 {
@@ -53,12 +53,12 @@ public:
     // Read data via the event handler. May only be called if
     // readable() returns true.
     //
-    virtual void read(IntStream&) = 0;
+    virtual void read(BasicStream&) = 0;
 
     //
     // A complete message has been received.
     //
-    virtual void message(IntStream&) = 0;
+    virtual void message(BasicStream&) = 0;
 
     //
     // Signal exception during reading or unmarshaling.
@@ -91,7 +91,7 @@ private:
     //
     // The _stream data member is for use by ThreadPool only
     //
-    IntStream _stream;
+    BasicStream _stream;
     friend ThreadPool;
 };
 
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 90881d0ec5c..1a4addb5b93 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -29,7 +29,7 @@ IceInternal::Incoming::~Incoming()
 }
 
 void
-IceInternal::Incoming::invoke(IntStream& is)
+IceInternal::Incoming::invoke(BasicStream& is)
 {
     _is.swap(is);
     string identity;
@@ -37,7 +37,7 @@ IceInternal::Incoming::invoke(IntStream& is)
     string operation;
     _is.read(operation);
 
-    IntStream::Container::size_type statusPos = _os.b.size();
+    BasicStream::Container::size_type statusPos = _os.b.size();
 
     ObjectPtr servant;
     ServantLocatorPtr locator;
@@ -118,13 +118,13 @@ IceInternal::Incoming::invoke(IntStream& is)
     }
 }
 
-IntStream*
+BasicStream*
 IceInternal::Incoming::is()
 {
     return &_is;
 }
 
-IntStream*
+BasicStream*
 IceInternal::Incoming::os()
 {
     return &_os;
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 8c4612705c9..cdc1fc7cb36 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -19,12 +19,14 @@ VERSIONED_NAME	= $(top_srcdir)/lib/$(VERSIONED_BASE)
 TARGETS		= $(NAME) $(VERSIONED_NAME)
 
 OBJS		= Application.o \
-		  IntStream.o \
 		  LocalException.o \
 		  Properties.o \
 		  PropertiesI.o \
 		  Logger.o \
 		  LoggerI.o \
+		  Stream.o \
+		  StreamI.o \
+		  BasicStream.o \
 		  SysLoggerI.o \
 		  TraceLevels.o \
 		  TraceUtil.o \
@@ -113,6 +115,23 @@ $(HDIR)/LoggerF.h: $(SDIR)/LoggerF.ice $(SLICE2CPP)
 clean::
 	rm -f $(HDIR)/LoggerF.h
 
+$(HDIR)/Stream.h Stream.cpp: $(SDIR)/Stream.ice $(SLICE2CPP)
+	rm -f $(HDIR)/Stream.h Stream.cpp
+	$(SLICECMD) $(SDIR)/Stream.ice
+	mv Stream.h $(HDIR)
+
+clean::
+	rm -f $(HDIR)/Stream.h Stream.cpp
+
+$(HDIR)/StreamF.h: $(SDIR)/StreamF.ice $(SLICE2CPP)
+	rm -f $(HDIR)/StreamF.h StreamF.cpp
+	$(SLICECMD) $(SDIR)/StreamF.ice
+	mv StreamF.h $(HDIR)
+	rm -f StreamF.cpp
+
+clean::
+	rm -f $(HDIR)/StreamF.h
+
 $(HDIR)/ObjectAdapter.h ObjectAdapter.cpp: $(SDIR)/ObjectAdapter.ice $(SLICE2CPP)
 	rm -f $(HDIR)/ObjectAdapter.h ObjectAdapter.cpp
 	$(SLICECMD) $(SDIR)/ObjectAdapter.ice
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 135734bfa96..57404c6f5d0 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -82,8 +82,8 @@ Ice::Object::_ping()
 DispatchStatus
 Ice::Object::____isA(Incoming& __in)
 {
-    IntStream* __is = __in.is();
-    IntStream* __os = __in.os();
+    BasicStream* __is = __in.is();
+    BasicStream* __os = __in.os();
     string s;
     __is->read(s);
     bool __ret = _isA(s);
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 21e37cb9bd0..fbb10f9911b 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -182,7 +182,7 @@ IceInternal::Outgoing::invoke()
 }
 
 void
-IceInternal::Outgoing::finished(IntStream& is)
+IceInternal::Outgoing::finished(BasicStream& is)
 {
     JTCSyncT<JTCMonitorT<JTCMutex> > sync(*this);
     assert(_state != StateUnsent);
@@ -263,13 +263,13 @@ IceInternal::Outgoing::finished(const LocalException& ex)
     }
 }
 
-IntStream*
+BasicStream*
 IceInternal::Outgoing::is()
 {
     return &_is;
 }
 
-IntStream*
+BasicStream*
 IceInternal::Outgoing::os()
 {
     return &_os;
diff --git a/cpp/src/Ice/PicklerI.cpp b/cpp/src/Ice/PicklerI.cpp
index a7168c9e0e8..d2600e6b39b 100644
--- a/cpp/src/Ice/PicklerI.cpp
+++ b/cpp/src/Ice/PicklerI.cpp
@@ -9,7 +9,7 @@
 // **********************************************************************
 
 #include <Ice/PicklerI.h>
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/Protocol.h>
 
@@ -20,7 +20,7 @@ using namespace IceInternal;
 void
 Ice::PicklerI::pickle(const ObjectPtr& servant, std::ostream& out)
 {
-    IntStream s(_instance);
+    BasicStream s(_instance);
     s.startWriteEncaps();
     s.write(servant);
     s.endWriteEncaps();
@@ -34,7 +34,7 @@ Ice::PicklerI::pickle(const ObjectPtr& servant, std::ostream& out)
 ObjectPtr
 Ice::PicklerI::unpickle(const string& type, std::istream& in)
 {
-    IntStream s(_instance);
+    BasicStream s(_instance);
     s.b.resize(4); // Encapsulation length == Ice::Int
     in.read(s.b.begin(), 4);
     if (in.eof())
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 6215f725c08..5a404cc0122 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -19,7 +19,7 @@
 #include <Ice/Logger.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/Emitter.h>
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/Functional.h>
 
@@ -460,8 +460,8 @@ bool
 IceDelegateM::Ice::Object::_isA(const string& s)
 {
     Outgoing __out(__emitter, __reference);
-    IntStream* __is = __out.is();
-    IntStream* __os = __out.os();
+    BasicStream* __is = __out.is();
+    BasicStream* __os = __out.os();
     __os->write("_isA");
     __os->write(s);
     if (!__out.invoke())
@@ -477,7 +477,7 @@ void
 IceDelegateM::Ice::Object::_ping()
 {
     Outgoing __out(__emitter, __reference);
-    IntStream* __os = __out.os();
+    BasicStream* __os = __out.os();
     __os->write("_ping");
     if (!__out.invoke())
     {
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index c240a92c7e4..947296db7c5 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -13,7 +13,7 @@
 #include <Ice/Proxy.h>
 #include <Ice/Reference.h>
 #include <Ice/Endpoint.h>
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 
 using namespace std;
 using namespace Ice;
@@ -36,7 +36,7 @@ IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy)
 }
 
 ObjectPrx
-IceInternal::ProxyFactory::streamToProxy(IntStream* s)
+IceInternal::ProxyFactory::streamToProxy(BasicStream* s)
 {
     string identity;
     s->read(identity);
@@ -60,7 +60,7 @@ IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& reference)
 }
 
 void
-IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, IntStream* s)
+IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s)
 {
     if (proxy)
     {
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 42afc5150e0..fca2986654c 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -20,7 +20,7 @@
 namespace IceInternal
 {
 
-class IntStream;
+class BasicStream;
 
 class ProxyFactory : public ::IceUtil::Shared
 {
@@ -29,9 +29,9 @@ public:
     ::Ice::ObjectPrx stringToProxy(const std::string&);
     std::string proxyToString(const ::Ice::ObjectPrx&);
 
-    ::Ice::ObjectPrx streamToProxy(IntStream*);
+    ::Ice::ObjectPrx streamToProxy(BasicStream*);
     ::Ice::ObjectPrx referenceToProxy(const ReferencePtr&);
-    void proxyToStream(const ::Ice::ObjectPrx&, IntStream*);
+    void proxyToStream(const ::Ice::ObjectPrx&, BasicStream*);
 
 private:
 
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index d63337b1be3..b21a99e7e9a 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -10,7 +10,7 @@
 
 #include <Ice/Reference.h>
 #include <Ice/Endpoint.h>
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 
 using namespace std;
@@ -179,7 +179,7 @@ IceInternal::Reference::Reference(const InstancePtr& inst, const string& str) :
     }
 }
 
-IceInternal::Reference::Reference(const string& ident, IntStream* s) :
+IceInternal::Reference::Reference(const string& ident, BasicStream* s) :
     instance(s->instance()),
     identity(ident),
     mode(ModeTwoway),
@@ -218,7 +218,7 @@ IceInternal::Reference::Reference(const string& ident, IntStream* s) :
 }
 
 void
-IceInternal::Reference::streamWrite(IntStream* s) const
+IceInternal::Reference::streamWrite(BasicStream* s) const
 {
     //
     // Don't write the identity here. Operations calling streamWrite
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index e8e7cff5c02..9c3f0924cc8 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -19,7 +19,7 @@
 namespace IceInternal
 {
 
-class IntStream;
+class BasicStream;
 
 class Reference : public ::IceUtil::Shared
 {
@@ -37,12 +37,12 @@ public:
     Reference(const InstancePtr&, const std::string&, Mode, bool,
 	      const std::vector<EndpointPtr>&, const std::vector<EndpointPtr>&);
     Reference(const InstancePtr&, const std::string&);
-    Reference(const std::string&, IntStream*);
+    Reference(const std::string&, BasicStream*);
 
     //
     // Marshal the reference
     //
-    void streamWrite(IntStream*) const;
+    void streamWrite(BasicStream*) const;
 
     //
     // Convert the reference to its string form
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
new file mode 100644
index 00000000000..37a4bc500dc
--- /dev/null
+++ b/cpp/src/Ice/StreamI.cpp
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <Ice/StreamI.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+Ice::StreamI::StreamI(const InstancePtr& instance) :
+    _stream(instance)
+{
+}
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
new file mode 100644
index 00000000000..d7ae060681d
--- /dev/null
+++ b/cpp/src/Ice/StreamI.h
@@ -0,0 +1,33 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_STREAM_I_H
+#define ICE_STREAM_I_H
+
+#include <Ice/Stream.h>
+#include <Ice/BasicStream.h>
+
+namespace Ice
+{
+
+class StreamI : public Stream
+{
+public:
+
+    StreamI(const ::IceInternal::InstancePtr&);
+
+private:
+
+    ::IceInternal::BasicStream _stream;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 2b9cff3f797..8c0430f61aa 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -470,7 +470,7 @@ IceInternal::ThreadPool::run()
 	    //
 	    // If the handler is "readable", try to read a message.
 	    //
-	    IntStream stream(_instance);
+	    BasicStream stream(_instance);
 	    if (handler->readable())
 	    {
 		try
@@ -499,9 +499,9 @@ IceInternal::ThreadPool::run()
 void
 IceInternal::ThreadPool::read(const EventHandlerPtr& handler)
 {
-    IntStream& stream = handler->_stream;
+    BasicStream& stream = handler->_stream;
     
-    if (stream.b.size() < static_cast<IntStream::Container::size_type>(headerSize)) // Read header?
+    if (stream.b.size() < static_cast<BasicStream::Container::size_type>(headerSize)) // Read header?
     {
 	if (stream.b.size() == 0)
 	{
@@ -516,7 +516,7 @@ IceInternal::ThreadPool::read(const EventHandlerPtr& handler)
 	}
     }
     
-    if (stream.b.size() >= static_cast<IntStream::Container::size_type>(headerSize)) // Interpret header?
+    if (stream.b.size() >= static_cast<BasicStream::Container::size_type>(headerSize)) // Interpret header?
     {
 	int pos = stream.i - stream.b.begin();
 	stream.i = stream.b.begin();
@@ -544,7 +544,7 @@ IceInternal::ThreadPool::read(const EventHandlerPtr& handler)
 	stream.i = stream.b.begin() + pos;
     }
     
-    if (stream.b.size() > static_cast<IntStream::Container::size_type>(headerSize) && stream.i != stream.b.end())
+    if (stream.b.size() > static_cast<BasicStream::Container::size_type>(headerSize) && stream.i != stream.b.end())
     {
 	handler->read(stream);
     }
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 5452da0e14a..40023194af6 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -20,7 +20,7 @@
 namespace IceInternal
 {
 
-class IntStream;
+class BasicStream;
 
 class ThreadPool : public ::IceUtil::Shared, public JTCMonitorT<JTCMutex>
 {
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index 6a6dda62fbc..aee573b13bb 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -13,7 +13,7 @@
 #include <Ice/Object.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/Logger.h>
-#include <Ice/IntStream.h>
+#include <Ice/BasicStream.h>
 #include <Ice/Protocol.h>
 
 using namespace std;
@@ -21,7 +21,7 @@ using namespace Ice;
 using namespace IceInternal;
 
 static void
-printHeader(ostream& s, IntStream& stream)
+printHeader(ostream& s, BasicStream& stream)
 {
     Byte protVer;
     stream.read(protVer);
@@ -66,13 +66,13 @@ printHeader(ostream& s, IntStream& stream)
 }
 
 void
-IceInternal::traceHeader(const char* heading, const IntStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceHeader(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
 			 const TraceLevelsPtr& tl)
 {
     if (tl->protocol >= 1)
     {
-	IntStream& stream = const_cast<IntStream&>(str);
-	IntStream::Container::iterator p = stream.i;
+	BasicStream& stream = const_cast<BasicStream&>(str);
+	BasicStream::Container::iterator p = stream.i;
 	stream.i = stream.b.begin();
 	ostringstream s;
 	s << heading;
@@ -83,13 +83,13 @@ IceInternal::traceHeader(const char* heading, const IntStream& str, const ::Ice:
 }
 
 void
-IceInternal::traceRequest(const char* heading, const IntStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceRequest(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
 			  const TraceLevelsPtr& tl)
 {
     if (tl->protocol >= 1)
     {
-	IntStream& stream = const_cast<IntStream&>(str);
-	IntStream::Container::iterator p = stream.i;
+	BasicStream& stream = const_cast<BasicStream&>(str);
+	BasicStream::Container::iterator p = stream.i;
 	stream.i = stream.b.begin();
 	ostringstream s;
 	s << heading;
@@ -113,13 +113,13 @@ IceInternal::traceRequest(const char* heading, const IntStream& str, const ::Ice
 }
 
 void
-IceInternal::traceBatchRequest(const char* heading, const IntStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceBatchRequest(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
 			       const TraceLevelsPtr& tl)
 {
     if (tl->protocol >= 1)
     {
-	IntStream& stream = const_cast<IntStream&>(str);
-	IntStream::Container::iterator p = stream.i;
+	BasicStream& stream = const_cast<BasicStream&>(str);
+	BasicStream::Container::iterator p = stream.i;
 	stream.i = stream.b.begin();
 	ostringstream s;
 	s << heading;
@@ -129,13 +129,13 @@ IceInternal::traceBatchRequest(const char* heading, const IntStream& str, const
 }
 
 void
-IceInternal::traceReply(const char* heading, const IntStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceReply(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
 			const TraceLevelsPtr& tl)
 {
     if (tl->protocol >= 1)
     {
-	IntStream& stream = const_cast<IntStream&>(str);
-	IntStream::Container::iterator p = stream.i;
+	BasicStream& stream = const_cast<BasicStream&>(str);
+	BasicStream::Container::iterator p = stream.i;
 	stream.i = stream.b.begin();
 	ostringstream s;
 	s << heading;
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index 36d5191d342..8841561ad82 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -17,12 +17,12 @@
 namespace IceInternal
 {
 
-class IntStream;
+class BasicStream;
 
-void traceHeader(const char*, const IntStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void traceRequest(const char*, const IntStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void traceBatchRequest(const char*, const IntStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void traceReply(const char*, const IntStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceHeader(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceBatchRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceReply(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 
 }
 
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 8702cab1914..87cde1982f9 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -168,6 +168,14 @@ SOURCE=.\LoggerI.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Stream.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\StreamI.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Network.cpp

 # End Source File

 # Begin Source File

@@ -232,7 +240,7 @@ SOURCE=.\SslTransceiver.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IntStream.cpp

+SOURCE=.\BasicStream.cpp

 # End Source File

 # Begin Source File

 

@@ -400,6 +408,18 @@ SOURCE=.\Ice\LoggerI.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\include\Ice\Stream.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Ice\StreamF.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Ice\StreamI.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\Ice\Native.h

 # End Source File

 # Begin Source File

@@ -512,7 +532,7 @@ SOURCE=.\Ice\SslTransceiver.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\IntStream.h

+SOURCE=..\..\include\Ice\BasicStream.h

 # End Source File

 # Begin Source File

 

@@ -716,6 +736,82 @@ InputPath=..\..\slice\Ice\LoggerF.ice
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\slice\Ice\Stream.ice

+

+!IF  "$(CFG)" == "Ice - Win32 Release"

+

+# Begin Custom Build

+InputPath=..\..\slice\Ice\Stream.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Stream.ice \

+	move Stream.h ..\..\include\Ice \

+	

+

+"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

+

+# Begin Custom Build

+InputPath=..\..\slice\Ice\Stream.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Stream.ice \

+	move Stream.h ..\..\include\Ice \

+	

+

+"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\slice\Ice\StreamF.ice

+

+!IF  "$(CFG)" == "Ice - Win32 Release"

+

+# Begin Custom Build

+InputPath=..\..\slice\Ice\StreamF.ice

+

+"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/StreamF.ice 

+	move StreamF.h ..\..\include\Ice 

+	del StreamF.cpp 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

+

+# Begin Custom Build

+InputPath=..\..\slice\Ice\StreamF.ice

+

+"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/StreamF.ice 

+	move StreamF.h ..\..\include\Ice 

+	del StreamF.cpp 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\slice\Ice\ObjectAdapter.ice

 

 !IF  "$(CFG)" == "Ice - Win32 Release"

diff --git a/cpp/src/IcePack/.depend b/cpp/src/IcePack/.depend
index 2d829225e25..586521fa924 100644
--- a/cpp/src/IcePack/.depend
+++ b/cpp/src/IcePack/.depend
@@ -1,9 +1,9 @@
-Admin.o: Admin.cpp ../../include/IcePack/Admin.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h
-Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
-Scanner.o: Scanner.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../IcePack/Grammar.h
-Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
-Client.o: Client.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
-Server.o: Server.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../IcePack/Activator.h
-Forward.o: Forward.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../IcePack/Activator.h ../../include/IcePack/Admin.h
-AdminI.o: AdminI.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
-Activator.o: Activator.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Activator.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/IntStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
+Admin.o: Admin.cpp ../../include/IcePack/Admin.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h
+Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
+Scanner.o: Scanner.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../IcePack/Grammar.h
+Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
+Client.o: Client.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
+Server.o: Server.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../IcePack/Activator.h
+Forward.o: Forward.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../IcePack/Activator.h ../../include/IcePack/Admin.h
+AdminI.o: AdminI.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
+Activator.o: Activator.cpp ../../include/Ice/Ice.h ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ServantFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/ServantFactory.h ../../include/Ice/Initialize.h ../../include/Ice/InstanceF.h ../IcePack/Activator.h ../../include/IcePack/Admin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 98af2278416..61665ff5c19 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -112,7 +112,7 @@ Slice::Gen::generate(const UnitPtr& unit)
     else
     {
 	H << "\n#include <Ice/LocalObject.h>";
-	C << "\n#include <Ice/IntStream.h>";
+	C << "\n#include <Ice/BasicStream.h>";
     }
 
     StringList includes = unit->includeFiles();
@@ -214,8 +214,8 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     string scoped = p->scoped();
 
     H << sp;
-    H << nl << _dllExport << "void __write(::IceInternal::IntStream*) const;"; // NOT virtual!
-    H << nl << _dllExport << "void __read(::IceInternal::IntStream*);"; // NOT virtual!
+    H << nl << _dllExport << "void __write(::IceInternal::BasicStream*) const;"; // NOT virtual!
+    H << nl << _dllExport << "void __read(::IceInternal::BasicStream*);"; // NOT virtual!
     H << eb << ';';
     
     TypeStringList memberList;
@@ -225,12 +225,12 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 	memberList.push_back(make_pair((*q)->type(), (*q)->name()));
     }
     C << sp;
-    C << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::IntStream* __os) const";
+    C << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const";
     C << sb;
     writeMarshalCode(C, memberList, 0);
     C << eb;
     C << sp;
-    C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::IntStream* __is)";
+    C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
     C << sb;
     writeUnmarshalCode(C, memberList, 0);
     C << eb;
@@ -266,10 +266,10 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
 
 	H << sp;
 	H << nl << "class __U__" << name << " { };";
-	H << nl << _dllExport << "void __write(::IceInternal::IntStream*, const " << name << "&, __U__" << name << ");";
-	H << nl << _dllExport << "void __read(::IceInternal::IntStream*, " << name << "&, __U__" << name << ");";
+	H << nl << _dllExport << "void __write(::IceInternal::BasicStream*, const " << name << "&, __U__" << name << ");";
+	H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "&, __U__" << name << ");";
 	C << sp;
-	C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::IntStream* __os, const " << scoped
+	C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, const " << scoped
 	  << "& v, " << scope << "__U__" << name << ')';
 	C << sb;
 	C << nl << "__os->write(::Ice::Int(v.size()));";
@@ -280,7 +280,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
 	C << eb;
 	C << eb;
 	C << sp;
-	C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::IntStream* __is, " << scoped
+	C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped
 	  << "& v, " << scope << "__U__" << name << ')';
 	C << sb;
 	C << nl << "::Ice::Int sz;";
@@ -326,10 +326,10 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
     
     H << sp;
     H << nl << "class __U__" << name << " { };";
-    H << nl << _dllExport << "void __write(::IceInternal::IntStream*, const " << name << "&, __U__" << name << ");";
-    H << nl << _dllExport << "void __read(::IceInternal::IntStream*, " << name << "&, __U__" << name << ");";
+    H << nl << _dllExport << "void __write(::IceInternal::BasicStream*, const " << name << "&, __U__" << name << ");";
+    H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "&, __U__" << name << ");";
     C << sp;
-    C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::IntStream* __os, const " << scoped
+    C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, const " << scoped
       << "& v, " << scope << "__U__" << name << ')';
     C << sb;
     C << nl << "__os->write(::Ice::Int(v.size()));";
@@ -341,7 +341,7 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
     C << eb;
     C << eb;
     C << sp;
-    C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::IntStream* __is, " << scoped
+    C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped
       << "& v, " << scope << "__U__" << name << ')';
     C << sb;
     C << nl << "::Ice::Int sz;";
@@ -381,10 +381,10 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     int sz = enumerators.size();
     
     H << sp;
-    H << nl << _dllExport << "void __write(::IceInternal::IntStream*, " << name << ");";
-    H << nl << _dllExport << "void __read(::IceInternal::IntStream*, " << name << "&);";
+    H << nl << _dllExport << "void __write(::IceInternal::BasicStream*, " << name << ");";
+    H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "&);";
     C << sp;
-    C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::IntStream* __os, " << scoped << " v)";
+    C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, " << scoped << " v)";
     C << sb;
     if (sz <= 0x7f)
     {
@@ -404,7 +404,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     }
     C << eb;
     C << sp;
-    C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::IntStream* __is, " << scoped << "& v)";
+    C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped << "& v)";
     C << sb;
     if (sz <= 0x7f)
     {
@@ -1018,9 +1018,9 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
     C << nl << "::IceInternal::Outgoing __out(__emitter, __reference);";
     if (ret || !outParams.empty() || !throws.empty())
     {
-	C << nl << "::IceInternal::IntStream* __is = __out.is();";
+	C << nl << "::IceInternal::BasicStream* __is = __out.is();";
     }
-    C << nl << "::IceInternal::IntStream* __os = __out.os();";
+    C << nl << "::IceInternal::BasicStream* __os = __out.os();";
     C << nl << "__os->write(\"" << name << "\");";
     writeMarshalCode(C, inParams, 0);
     C << nl << "if (!__out.invoke())";
@@ -1702,8 +1702,8 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 	    C << eb;
 	}
 	H << sp;
-	H << nl << exp2 << "virtual void __write(::IceInternal::IntStream*);";
-	H << nl << exp2 << "virtual void __read(::IceInternal::IntStream*);";
+	H << nl << exp2 << "virtual void __write(::IceInternal::BasicStream*);";
+	H << nl << exp2 << "virtual void __read(::IceInternal::BasicStream*);";
 	TypeStringList memberList;
 	DataMemberList dataMembers = p->dataMembers();
 	for (DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
@@ -1711,7 +1711,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 	    memberList.push_back(make_pair((*q)->type(), (*q)->name()));
 	}
 	C << sp;
-	C << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::IntStream* __os)";
+	C << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os)";
 	C << sb;
 	C << nl << "__os->startWriteEncaps();";
 	writeMarshalCode(C, memberList, 0);
@@ -1732,7 +1732,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 	}
 	C << eb;
 	C << sp;
-	C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::IntStream* __is)";
+	C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
 	C << sb;
 	C << nl << "__is->startReadEncaps();";
 	writeUnmarshalCode(C, memberList, 0);
@@ -1843,11 +1843,11 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
 	C << sb;
 	if (!inParams.empty())
 	{
-	    C << nl << "::IceInternal::IntStream* __is = __in.is();";
+	    C << nl << "::IceInternal::BasicStream* __is = __in.is();";
 	}
 	if (ret || !outParams.empty() || !throws.empty())
 	{
-	    C << nl << "::IceInternal::IntStream* __os = __in.os();";
+	    C << nl << "::IceInternal::BasicStream* __os = __in.os();";
 	}
 	writeAllocateCode(C, inParams, 0);
 	writeUnmarshalCode(C, inParams, 0);
@@ -2041,8 +2041,8 @@ Slice::Gen::HandleVisitor::visitClassDecl(const ClassDeclPtr& p)
     {
 	H << nl << "typedef ::IceInternal::ProxyHandle< ::IceProxy" << scoped << "> " << name << "Prx;";
 	H << sp;
-	H << nl << _dllExport << "void __write(::IceInternal::IntStream*, const " << name << "Prx&);";
-	H << nl << _dllExport << "void __read(::IceInternal::IntStream*, " << name << "Prx&);";
+	H << nl << _dllExport << "void __write(::IceInternal::BasicStream*, const " << name << "Prx&);";
+	H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "Prx&);";
     }
 }
 
@@ -2058,12 +2058,12 @@ Slice::Gen::HandleVisitor::visitClassDefStart(const ClassDefPtr& p)
     string scope = p->scope();
 
     C << sp;
-    C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::IntStream* __os, const " << scoped << "Prx& v)";
+    C << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, const " << scoped << "Prx& v)";
     C << sb;
     C << nl << "__os->write(::Ice::ObjectPrx(v));";
     C << eb;
     C << sp;
-    C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::IntStream* __is, " << scoped << "Prx& v)";
+    C << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped << "Prx& v)";
     C << sb;
     C << nl << "::Ice::ObjectPrx proxy;";
     C << nl << "__is->read(proxy);";
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 3195e1f8cb3..f9f392db226 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -163,9 +163,9 @@ writeDict(const string& n, UnitPtr& unit, const Dict& dict, Output& H, Output& C
       << inputTypeToString(valueType) << " value)";
     C << sb;
     C << nl << "IceInternal::InstancePtr instance = IceInternal::getInstance(_db->getCommunicator());";
-    C << nl << "IceInternal::IntStream keyStream(instance);";
+    C << nl << "IceInternal::BasicStream keyStream(instance);";
     writeMarshalUnmarshalCode(C, keyType, "key", true, "keyStream", false);
-    C << nl << "IceInternal::IntStream valueStream(instance);";
+    C << nl << "IceInternal::BasicStream valueStream(instance);";
     writeMarshalUnmarshalCode(C, keyType, "value", true, "valueStream", false);
     C << nl << "_db->put(keyStream.b, valueStream.b);";
     C << eb;
@@ -173,9 +173,9 @@ writeDict(const string& n, UnitPtr& unit, const Dict& dict, Output& H, Output& C
       << " key)";
     C << sb;
     C << nl << "IceInternal::InstancePtr instance = IceInternal::getInstance(_db->getCommunicator());";
-    C << nl << "IceInternal::IntStream keyStream(instance);";
+    C << nl << "IceInternal::BasicStream keyStream(instance);";
     writeMarshalUnmarshalCode(C, keyType, "key", true, "keyStream", false);
-    C << nl << "IceInternal::IntStream valueStream(instance);";
+    C << nl << "IceInternal::BasicStream valueStream(instance);";
     C << nl << "valueStream.b = _db->get(keyStream.b);";
     C << nl << "valueStream.i = valueStream.b.begin();";
     C << nl << typeToString(valueType) << " value;";
@@ -185,7 +185,7 @@ writeDict(const string& n, UnitPtr& unit, const Dict& dict, Output& H, Output& C
     C << sp << nl << "void" << nl << absolute << "::del(" << inputTypeToString(keyType) << " key)";
     C << sb;
     C << nl << "IceInternal::InstancePtr instance = IceInternal::getInstance(_db->getCommunicator());";
-    C << nl << "IceInternal::IntStream keyStream(instance);";
+    C << nl << "IceInternal::BasicStream keyStream(instance);";
     writeMarshalUnmarshalCode(C, keyType, "key", true, "keyStream", false);
     C << nl << "_db->del(keyStream.b);";
     C << eb;
@@ -502,7 +502,7 @@ main(int argc, char* argv[])
 	H << "\n#define __" << s << "__";
 	H << '\n';
 	H << "\n#include <Ice/Ice.h>";
-	H << "\n#include <Ice/IntStream.h>";
+	H << "\n#include <Ice/BasicStream.h>";
 	H << "\n#include <Freeze/DB.h>";
 	
 	{