summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-12-08 11:33:42 -0500
committerJoe George <joe@zeroc.com>2015-12-08 16:09:24 -0500
commit6a43686ce26de5d2d5edf4a485ecff3a242c26b6 (patch)
treed31e4f16dc9ed6e28056a7224e045a4638955f5e /cpp/src
parentC++11 mapping IceDiscovery plug-in (diff)
downloadice-6a43686ce26de5d2d5edf4a485ecff3a242c26b6.tar.bz2
ice-6a43686ce26de5d2d5edf4a485ecff3a242c26b6.tar.xz
ice-6a43686ce26de5d2d5edf4a485ecff3a242c26b6.zip
ICE-6908 - Add ValueFactory
ValueFactory is a replacement for ObjectFactory (which is still available if needed). It is an interface with only one operation and can has the "delegate" metadata.
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/Instance.cpp10
-rwxr-xr-xcpp/src/Ice/.depend.mak1065
-rw-r--r--cpp/src/Ice/.gitignore1
-rw-r--r--cpp/src/Ice/BasicStream.cpp22
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp44
-rw-r--r--cpp/src/Ice/CommunicatorI.h11
-rw-r--r--cpp/src/Ice/Exception.cpp6
-rw-r--r--cpp/src/Ice/FactoryTable.cpp42
-rw-r--r--cpp/src/Ice/FactoryTableInit.cpp2
-rw-r--r--cpp/src/Ice/Instance.cpp6
-rw-r--r--cpp/src/Ice/Instance.h6
-rw-r--r--cpp/src/Ice/Makefile5
-rw-r--r--cpp/src/Ice/Makefile.mak4
-rw-r--r--cpp/src/Ice/ObjectFactoryManager.cpp147
-rw-r--r--cpp/src/Ice/ObjectFactoryManager.h43
-rw-r--r--cpp/src/Ice/ValueFactoryManager.cpp175
-rw-r--r--cpp/src/Ice/ValueFactoryManager.h61
-rw-r--r--cpp/src/IceGrid/IceGridDB.cpp14
-rw-r--r--cpp/src/slice2cpp/Gen.cpp12
-rw-r--r--cpp/src/slice2java/Gen.cpp9
20 files changed, 993 insertions, 692 deletions
diff --git a/cpp/src/Glacier2/Instance.cpp b/cpp/src/Glacier2/Instance.cpp
index 83eab27bda7..f9c4c1dc00a 100644
--- a/cpp/src/Glacier2/Instance.cpp
+++ b/cpp/src/Glacier2/Instance.cpp
@@ -25,7 +25,7 @@ const string clientBuffered = "Glacier2.Client.Buffered";
}
-Glacier2::Instance::Instance(const Ice::CommunicatorPtr& communicator, const Ice::ObjectAdapterPtr& clientAdapter,
+Glacier2::Instance::Instance(const Ice::CommunicatorPtr& communicator, const Ice::ObjectAdapterPtr& clientAdapter,
const Ice::ObjectAdapterPtr& serverAdapter) :
_communicator(communicator),
_properties(communicator->getProperties()),
@@ -69,12 +69,12 @@ Glacier2::Instance::Instance(const Ice::CommunicatorPtr& communicator, const Ice
// If an Ice metrics observer is setup on the communicator, also
// enable metrics for IceStorm.
//
- IceInternal::CommunicatorObserverIPtr o =
+ IceInternal::CommunicatorObserverIPtr o =
IceInternal::CommunicatorObserverIPtr::dynamicCast(communicator->getObserver());
if(o)
{
- const_cast<Glacier2::Instrumentation::RouterObserverPtr&>(_observer) =
- new RouterObserverI(o->getFacet(),
+ const_cast<Glacier2::Instrumentation::RouterObserverPtr&>(_observer) =
+ new RouterObserverI(o->getFacet(),
_properties->getPropertyWithDefault("Glacier2.InstanceName", "Glacier2"));
}
}
@@ -90,7 +90,7 @@ Glacier2::Instance::destroy()
{
_clientRequestQueueThread->destroy();
}
-
+
if(_serverRequestQueueThread)
{
_serverRequestQueueThread->destroy();
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak
index f858d5d4a32..4f4e11d2b6b 100755
--- a/cpp/src/Ice/.depend.mak
+++ b/cpp/src/Ice/.depend.mak
@@ -8,6 +8,7 @@ Communicator.h: \
"$(slicedir)/Ice/InstrumentationF.ice" \
"$(slicedir)/Ice/ObjectAdapterF.ice" \
"$(slicedir)/Ice/ObjectFactory.ice" \
+ "$(slicedir)/Ice/ValueFactory.ice" \
"$(slicedir)/Ice/RouterF.ice" \
"$(slicedir)/Ice/LocatorF.ice" \
"$(slicedir)/Ice/PluginF.ice" \
@@ -179,6 +180,9 @@ ServantLocatorF.h: \
SliceChecksumDict.h: \
"$(slicedir)\Ice\SliceChecksumDict.ice"
+ValueFactory.h: \
+ "$(slicedir)\Ice\ValueFactory.ice"
+
Version.h: \
"$(slicedir)\Ice\Version.ice"
@@ -247,13 +251,15 @@ Acceptor.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
@@ -319,15 +325,16 @@ ACM.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\LoggerF.h" \
"ConnectionI.h" \
@@ -346,9 +353,9 @@ ACM.obj: \
"NetworkF.h" \
"NetworkProxyF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -359,6 +366,8 @@ ACM.obj: \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
@@ -390,6 +399,7 @@ Application.obj: \
"$(includedir)\IceUtil\PushDisableWarnings.h" \
"$(includedir)\Ice\Config.h" \
"$(includedir)\IceUtil\Config.h" \
+ "$(includedir)\Ice\Comparable.h" \
"$(includedir)\Ice\DeprecatedStringConverter.h" \
"$(includedir)\Ice\CommunicatorF.h" \
"$(includedir)\Ice\ProxyF.h" \
@@ -450,17 +460,17 @@ Application.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -470,13 +480,14 @@ Application.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\RemoteLogger.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"$(includedir)\Ice\Communicator.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -505,6 +516,7 @@ Application.obj: \
"$(includedir)\Ice\SliceChecksumDict.h" \
"$(includedir)\Ice\Service.h" \
"$(includedir)\Ice\RegisterPlugins.h" \
+ "$(includedir)\Ice\InterfaceByValue.h" \
"LoggerI.h" \
"$(includedir)\IceUtil\FileUtil.h" \
"$(includedir)\IceUtil\CtrlCHandler.h" \
@@ -562,8 +574,8 @@ AsyncResult.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -581,12 +593,15 @@ AsyncResult.obj: \
"$(includedir)\Ice\EndpointTypes.h" \
"$(includedir)\Ice\ReferenceF.h" \
"$(includedir)\Ice\BatchRequestQueueF.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"EventHandler.h" \
"EventHandlerF.h" \
"Network.h" \
"NetworkF.h" \
"NetworkProxyF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"Selector.h" \
"$(includedir)\IceUtil\StringUtil.h" \
"Instance.h" \
@@ -603,7 +618,6 @@ AsyncResult.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"IPEndpointIF.h" \
@@ -615,7 +629,6 @@ AsyncResult.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -625,6 +638,8 @@ AsyncResult.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\Properties.h" \
@@ -682,8 +697,8 @@ BasicStream.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -708,8 +723,9 @@ BasicStream.obj: \
"$(includedir)\Ice\AsyncResultF.h" \
"$(includedir)\Ice\ObserverHelper.h" \
"$(includedir)\Ice\Instrumentation.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"Network.h" \
"NetworkF.h" \
"NetworkProxyF.h" \
@@ -741,7 +757,6 @@ BasicStream.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -751,14 +766,15 @@ BasicStream.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"ProxyFactory.h" \
"$(includedir)\Ice\OutgoingAsyncF.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "ObjectFactoryManager.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
+ "ValueFactoryManager.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"TraceUtil.h" \
"TraceLevels.h" \
"$(includedir)\Ice\LoggerUtil.h" \
@@ -812,8 +828,8 @@ BatchRequestQueue.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -846,8 +862,9 @@ BatchRequestQueue.obj: \
"$(includedir)\Ice\AsyncResultF.h" \
"$(includedir)\Ice\ObserverHelper.h" \
"$(includedir)\Ice\Instrumentation.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
@@ -863,7 +880,6 @@ BatchRequestQueue.obj: \
"$(includedir)\Ice\Plugin.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -873,6 +889,8 @@ BatchRequestQueue.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
@@ -956,6 +974,7 @@ CollocatedRequestHandler.obj: \
"$(includedir)\Ice\Version.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "VirtualShared.h" \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\InstanceF.h" \
@@ -964,8 +983,8 @@ CollocatedRequestHandler.obj: \
"$(includedir)\Ice\Current.h" \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -1025,6 +1044,8 @@ CollocatedRequestHandler.obj: \
"$(includedir)\Ice\Value.h" \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"Instance.h" \
"$(includedir)\Ice\InstrumentationF.h" \
@@ -1108,17 +1129,18 @@ CommunicatorI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Plugin.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"$(includedir)\Ice\Communicator.h" \
@@ -1130,6 +1152,9 @@ CommunicatorI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -1158,7 +1183,6 @@ CommunicatorI.obj: \
"NetworkProxyF.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Process.h" \
"ConnectionFactory.h" \
"ConnectionI.h" \
@@ -1171,6 +1195,7 @@ CommunicatorI.obj: \
"EventHandlerF.h" \
"Network.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -1182,7 +1207,7 @@ CommunicatorI.obj: \
"BatchRequestQueue.h" \
"SharedContext.h" \
"ProxyFactory.h" \
- "ObjectFactoryManager.h" \
+ "ValueFactoryManager.h" \
"ObjectAdapterFactory.h" \
"ObjectAdapterI.h" \
"$(includedir)\Ice\ObjectAdapter.h" \
@@ -1258,15 +1283,16 @@ ConnectionFactory.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"TransceiverF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"EndpointIF.h" \
@@ -1282,9 +1308,9 @@ ConnectionFactory.obj: \
"NetworkProxyF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -1318,6 +1344,8 @@ ConnectionFactory.obj: \
"$(includedir)\Ice\Value.h" \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"TraceLevels.h" \
@@ -1408,15 +1436,16 @@ ConnectionI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\ConnectionFactoryF.h" \
"TransceiverF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
@@ -1433,9 +1462,9 @@ ConnectionI.obj: \
"NetworkProxyF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -1466,6 +1495,8 @@ ConnectionI.obj: \
"$(includedir)\Ice\Value.h" \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\Properties.h" \
@@ -1552,13 +1583,15 @@ ConnectionRequestHandler.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"Reference.h" \
"ReferenceFactoryF.h" \
"EndpointIF.h" \
@@ -1578,8 +1611,9 @@ ConnectionRequestHandler.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"ConnectionI.h" \
"..\..\src\IceUtil\StopWatch.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -1599,8 +1633,8 @@ ConnectionRequestHandler.obj: \
"NetworkProxyF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
"ACM.h" \
@@ -1689,13 +1723,15 @@ ConnectRequestHandler.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LocatorF.h" \
"RouterInfoF.h" \
"LocatorInfoF.h" \
@@ -1711,8 +1747,9 @@ ConnectRequestHandler.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"RouterInfo.h" \
"$(includedir)\Ice\Router.h" \
"$(includedir)\Ice\Comparable.h" \
@@ -1746,7 +1783,6 @@ ConnectRequestHandler.obj: \
"$(includedir)\Ice\Plugin.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"ConnectionI.h" \
@@ -1757,6 +1793,7 @@ ConnectRequestHandler.obj: \
"EventHandlerF.h" \
"Network.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"ResponseHandler.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
"$(includedir)\Ice\Outgoing.h" \
@@ -1825,15 +1862,16 @@ DefaultsAndOverrides.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"Network.h" \
"NetworkF.h" \
"NetworkProxyF.h" \
@@ -1848,11 +1886,12 @@ DefaultsAndOverrides.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\Plugin.h" \
- "$(includedir)\Ice\LocalException.h" \
DeprecatedStringConverter.obj: \
DeprecatedStringConverter.cpp \
@@ -1920,13 +1959,14 @@ DeprecatedStringConverter.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
@@ -1953,7 +1993,6 @@ DeprecatedStringConverter.obj: \
"NetworkProxyF.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -1963,6 +2002,8 @@ DeprecatedStringConverter.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
DispatchInterceptor.obj: \
DispatchInterceptor.cpp \
@@ -2011,8 +2052,8 @@ DispatchInterceptor.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\IceUtil\StringConverter.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2118,13 +2159,14 @@ EndpointFactory.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
@@ -2140,7 +2182,6 @@ EndpointFactory.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -2150,6 +2191,8 @@ EndpointFactory.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"EndpointFactoryManager.h" \
EndpointFactoryManager.obj: \
@@ -2211,8 +2254,8 @@ EndpointFactoryManager.obj: \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2269,6 +2312,8 @@ EndpointFactoryManager.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
@@ -2357,8 +2402,8 @@ EventHandler.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2384,8 +2429,11 @@ EventHandler.obj: \
"$(includedir)\Ice\AsyncResultF.h" \
"$(includedir)\Ice\ObserverHelper.h" \
"$(includedir)\Ice\Instrumentation.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -2401,7 +2449,6 @@ EventHandler.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"IPEndpointIF.h" \
@@ -2414,7 +2461,6 @@ EventHandler.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -2424,6 +2470,8 @@ EventHandler.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
Exception.obj: \
Exception.cpp \
@@ -2488,8 +2536,8 @@ Exception.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2520,7 +2568,7 @@ FactoryTable.obj: \
"$(includedir)\IceUtil\Atomic.h" \
"$(includedir)\IceUtil\Handle.h" \
"$(includedir)\Ice\Config.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
"$(includedir)\IceUtil\PushDisableWarnings.h" \
"$(includedir)\Ice\ProxyF.h" \
"$(includedir)\Ice\ProxyHandle.h" \
@@ -2556,7 +2604,7 @@ FactoryTableInit.obj: \
"$(includedir)\IceUtil\Atomic.h" \
"$(includedir)\IceUtil\Handle.h" \
"$(includedir)\Ice\Config.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
"$(includedir)\IceUtil\PushDisableWarnings.h" \
"$(includedir)\Ice\ProxyF.h" \
"$(includedir)\Ice\ProxyHandle.h" \
@@ -2575,7 +2623,7 @@ FactoryTableInit.obj: \
"$(includedir)\IceUtil\Optional.h" \
"$(includedir)\IceUtil\UndefSysMacros.h" \
"$(includedir)\IceUtil\PopDisableWarnings.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
GCObject.obj: \
@@ -2661,8 +2709,8 @@ HttpParser.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2717,8 +2765,8 @@ ImplicitContextI.obj: \
"$(includedir)\IceUtil\Time.h" \
"$(includedir)\IceUtil\MutexProtocol.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2771,8 +2819,8 @@ Incoming.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2797,10 +2845,11 @@ Incoming.obj: \
"$(includedir)\IceUtil\UniquePtr.h" \
"$(includedir)\Ice\CommunicatorF.h" \
"$(includedir)\Ice\AsyncResultF.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ServantLocator.h" \
"ServantManager.h" \
"ConnectionI.h" \
@@ -2823,9 +2872,9 @@ Incoming.obj: \
"NetworkProxyF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
"ACM.h" \
@@ -2852,6 +2901,8 @@ Incoming.obj: \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\Ice\LoggerUtil.h" \
@@ -2905,8 +2956,8 @@ IncomingAsync.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -2934,8 +2985,9 @@ IncomingAsync.obj: \
"$(includedir)\Ice\BatchRequestQueueF.h" \
"$(includedir)\Ice\AsyncResult.h" \
"$(includedir)\Ice\AsyncResultF.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\ConnectionFactoryF.h" \
"TransceiverF.h" \
"EndpointIF.h" \
@@ -2951,9 +3003,9 @@ IncomingAsync.obj: \
"NetworkProxyF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
"ACM.h" \
@@ -2981,6 +3033,8 @@ IncomingAsync.obj: \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"ReplyStatus.h" \
@@ -3050,17 +3104,18 @@ Initialize.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Plugin.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"$(includedir)\Ice\Communicator.h" \
@@ -3072,6 +3127,9 @@ Initialize.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -3081,7 +3139,6 @@ Initialize.obj: \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\CommunicatorAsync.h" \
"PropertiesI.h" \
- "$(includedir)\Ice\LocalException.h" \
"StreamI.h" \
"$(includedir)\Ice\Stream.h" \
"LoggerI.h" \
@@ -3182,15 +3239,16 @@ Instance.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
@@ -3207,7 +3265,6 @@ Instance.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -3217,6 +3274,8 @@ Instance.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"TraceLevels.h" \
"DefaultsAndOverrides.h" \
"Network.h" \
@@ -3229,8 +3288,6 @@ Instance.obj: \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\Locator.h" \
"$(includedir)\Ice\IncomingAsync.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"ReferenceFactory.h" \
"Reference.h" \
"$(includedir)\Ice\RouterF.h" \
@@ -3243,6 +3300,7 @@ Instance.obj: \
"ThreadPool.h" \
"EventHandler.h" \
"EventHandlerF.h" \
+ "VirtualShared.h" \
"Selector.h" \
"$(includedir)\IceUtil\StringUtil.h" \
"ConnectionFactory.h" \
@@ -3255,7 +3313,8 @@ Instance.obj: \
"$(includedir)\Ice\ConnectionAsync.h" \
"AcceptorF.h" \
"EndpointI.h" \
- "ObjectFactoryManager.h" \
+ "ValueFactoryManager.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"ObjectAdapterFactory.h" \
"ObjectAdapterI.h" \
"$(includedir)\Ice\ObjectAdapter.h" \
@@ -3352,13 +3411,14 @@ InstrumentationI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Metrics.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -3368,7 +3428,7 @@ InstrumentationI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\MetricsAdminI.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
@@ -3387,8 +3447,8 @@ InstrumentationI.obj: \
"$(includedir)\Ice\ObjectAdapter.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\FacetMap.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Communicator.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\PluginF.h" \
"$(includedir)\Ice\ImplicitContextF.h" \
@@ -3466,13 +3526,14 @@ IPEndpointI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
"ProtocolInstance.h" \
@@ -3501,7 +3562,6 @@ IPEndpointI.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -3511,6 +3571,8 @@ IPEndpointI.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"PropertiesI.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
@@ -3593,13 +3655,15 @@ LocatorInfo.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"EndpointIF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\Locator.h" \
@@ -3612,10 +3676,8 @@ LocatorInfo.obj: \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
"$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Process.h" \
- "$(includedir)\Ice\LocalException.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -3662,6 +3724,7 @@ LocatorInfo.obj: \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\Ice\Functional.h" \
"$(includedir)\IceUtil\Functional.h" \
+ "$(includedir)\Ice\Comparable.h" \
LoggerAdminI.obj: \
LoggerAdminI.cpp \
@@ -3723,20 +3786,21 @@ LoggerAdminI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Initialize.h" \
"$(includedir)\IceUtil\Timer.h" \
"$(includedir)\IceUtil\Thread.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Plugin.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"$(includedir)\Ice\Communicator.h" \
@@ -3748,6 +3812,9 @@ LoggerAdminI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -3756,12 +3823,9 @@ LoggerAdminI.obj: \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\RemoteLogger.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"$(includedir)\Ice\ObjectAdapter.h" \
"$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\Connection.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\LoggerUtil.h" \
LoggerI.obj: \
@@ -3884,8 +3948,8 @@ LoggerUtil.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -3915,6 +3979,8 @@ LoggerUtil.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
MetricsAdminI.obj: \
MetricsAdminI.cpp \
@@ -3975,13 +4041,15 @@ MetricsAdminI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -3990,8 +4058,9 @@ MetricsAdminI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\NativePropertiesAdmin.h" \
"$(includedir)\Ice\Initialize.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -4003,8 +4072,6 @@ MetricsAdminI.obj: \
"$(includedir)\Ice\Plugin.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"$(includedir)\Ice\Metrics.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"InstrumentationI.h" \
"$(includedir)\Ice\MetricsObserverI.h" \
"..\..\src\IceUtil\StopWatch.h" \
@@ -4013,6 +4080,7 @@ MetricsAdminI.obj: \
"$(includedir)\Ice\MetricsFunctional.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\Communicator.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -4038,7 +4106,6 @@ MetricsAdminI.obj: \
"NetworkProxyF.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\IceUtil\StringUtil.h" \
@@ -4105,13 +4172,14 @@ MetricsObserverI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Metrics.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -4121,7 +4189,7 @@ MetricsObserverI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\MetricsAdminI.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
@@ -4200,19 +4268,19 @@ Network.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
"NetworkProxy.h" \
"$(includedir)\IceUtil\StringUtil.h" \
- "$(includedir)\Ice\LocalException.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"ProtocolInstance.h" \
"EndpointIF.h" \
"ConnectorF.h" \
@@ -4253,6 +4321,8 @@ Network.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
@@ -4322,18 +4392,18 @@ NetworkProxy.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
"HttpParser.h" \
- "$(includedir)\Ice\LocalException.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -4343,6 +4413,8 @@ NetworkProxy.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
Object.obj: \
@@ -4390,8 +4462,8 @@ Object.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\IceUtil\StringConverter.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -4484,18 +4556,19 @@ ObjectAdapterFactory.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"$(includedir)\Ice\ConnectionFactoryF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
@@ -4511,7 +4584,6 @@ ObjectAdapterFactory.obj: \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\LoggerF.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Functional.h" \
"$(includedir)\IceUtil\Functional.h" \
"$(includedir)\IceUtil\UUID.h" \
@@ -4577,18 +4649,19 @@ ObjectAdapterI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"$(includedir)\Ice\ConnectionFactoryF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
@@ -4623,13 +4696,14 @@ ObjectAdapterI.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"ProxyFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\IncomingAsync.h" \
@@ -4652,6 +4726,7 @@ ObjectAdapterI.obj: \
"EventHandlerF.h" \
"Network.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -4663,60 +4738,18 @@ ObjectAdapterI.obj: \
"$(includedir)\IceUtil\Functional.h" \
"LocatorInfo.h" \
"$(includedir)\Ice\Locator.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"ThreadPool.h" \
"Selector.h" \
"$(includedir)\IceUtil\StringUtil.h" \
"$(includedir)\Ice\Communicator.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\ImplicitContextF.h" \
"DefaultsAndOverrides.h" \
"TraceLevels.h" \
"PropertyNames.h" \
-ObjectFactoryManager.obj: \
- ObjectFactoryManager.cpp \
- "ObjectFactoryManager.h" \
- "$(includedir)\IceUtil\Shared.h" \
- "$(includedir)\IceUtil\Config.h" \
- "$(includedir)\IceUtil\Atomic.h" \
- "$(includedir)\IceUtil\Mutex.h" \
- "$(includedir)\IceUtil\Lock.h" \
- "$(includedir)\IceUtil\ThreadException.h" \
- "$(includedir)\IceUtil\Exception.h" \
- "$(includedir)\IceUtil\Time.h" \
- "$(includedir)\IceUtil\MutexProtocol.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
- "$(includedir)\Ice\Handle.h" \
- "$(includedir)\IceUtil\Handle.h" \
- "$(includedir)\Ice\Config.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\IceUtil\PushDisableWarnings.h" \
- "$(includedir)\Ice\ProxyF.h" \
- "$(includedir)\Ice\ProxyHandle.h" \
- "$(includedir)\Ice\ObjectF.h" \
- "$(includedir)\Ice\ValueF.h" \
- "$(includedir)\Ice\Exception.h" \
- "$(includedir)\Ice\Format.h" \
- "$(includedir)\Ice\StreamF.h" \
- "$(includedir)\Ice\LocalObject.h" \
- "$(includedir)\Ice\LocalObjectF.h" \
- "$(includedir)\Ice\StreamHelpers.h" \
- "$(includedir)\IceUtil\ScopedArray.h" \
- "$(includedir)\IceUtil\Iterator.h" \
- "$(includedir)\Ice\Traits.h" \
- "$(includedir)\IceUtil\Optional.h" \
- "$(includedir)\IceUtil\UndefSysMacros.h" \
- "$(includedir)\IceUtil\PopDisableWarnings.h" \
- "$(includedir)\Ice\Functional.h" \
- "$(includedir)\IceUtil\Functional.h" \
- "$(includedir)\Ice\LocalException.h" \
- "$(includedir)\Ice\Identity.h" \
- "$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
-
ObserverHelper.obj: \
ObserverHelper.cpp \
"$(includedir)\Ice\ObserverHelper.h" \
@@ -4778,13 +4811,15 @@ ObserverHelper.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LocatorF.h" \
"RouterInfoF.h" \
"LocatorInfoF.h" \
@@ -4800,8 +4835,9 @@ ObserverHelper.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -4830,7 +4866,6 @@ ObserverHelper.obj: \
"$(includedir)\Ice\Plugin.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
@@ -4891,8 +4926,8 @@ OpaqueEndpointI.obj: \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -4914,12 +4949,12 @@ OpaqueEndpointI.obj: \
"$(includedir)\Ice\AsyncResultF.h" \
"$(includedir)\Ice\ObserverHelper.h" \
"$(includedir)\Ice\Instrumentation.h" \
+ "$(includedir)\Ice\LocalException.h" \
"Network.h" \
"NetworkF.h" \
"NetworkProxyF.h" \
"Base64.h" \
"HashUtil.h" \
- "$(includedir)\Ice\LocalException.h" \
Outgoing.obj: \
Outgoing.cpp \
@@ -4969,8 +5004,8 @@ Outgoing.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -4991,8 +5026,9 @@ Outgoing.obj: \
"$(includedir)\Ice\BatchRequestQueueF.h" \
"$(includedir)\Ice\AsyncResult.h" \
"$(includedir)\Ice\AsyncResultF.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\ConnectionFactoryF.h" \
"TransceiverF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
@@ -5009,9 +5045,9 @@ Outgoing.obj: \
"NetworkProxyF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -5034,6 +5070,8 @@ Outgoing.obj: \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
@@ -5108,8 +5146,8 @@ OutgoingAsync.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -5124,8 +5162,9 @@ OutgoingAsync.obj: \
"$(includedir)\Ice\EndpointTypes.h" \
"$(includedir)\Ice\ReferenceF.h" \
"$(includedir)\Ice\BatchRequestQueueF.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\ConnectionFactoryF.h" \
"TransceiverF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
@@ -5141,9 +5180,9 @@ OutgoingAsync.obj: \
"NetworkProxyF.h" \
"$(includedir)\Ice\PropertiesF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -5166,6 +5205,8 @@ OutgoingAsync.obj: \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
@@ -5255,13 +5296,14 @@ PluginManagerI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -5270,7 +5312,10 @@ PluginManagerI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\InstrumentationF.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -5306,7 +5351,6 @@ PluginManagerI.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Process.h" \
PropertiesAdminI.obj: \
@@ -5369,13 +5413,15 @@ PropertiesAdminI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -5384,8 +5430,9 @@ PropertiesAdminI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\NativePropertiesAdmin.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\Logger.h" \
@@ -5451,13 +5498,15 @@ PropertiesI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -5466,8 +5515,9 @@ PropertiesI.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\IceUtil\StringUtil.h" \
"$(includedir)\IceUtil\FileUtil.h" \
"$(includedir)\Ice\Initialize.h" \
@@ -5479,11 +5529,11 @@ PropertiesI.obj: \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\Plugin.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
- "$(includedir)\Ice\LocalException.h" \
"PropertyNames.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Communicator.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -5588,13 +5638,15 @@ ProtocolInstance.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"EndpointIF.h" \
"ConnectorF.h" \
@@ -5616,7 +5668,6 @@ ProtocolInstance.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -5629,7 +5680,6 @@ ProtocolInstance.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -5639,6 +5689,8 @@ ProtocolInstance.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"IPEndpointI.h" \
"EndpointI.h" \
"TransceiverF.h" \
@@ -5724,15 +5776,16 @@ ProtocolPluginFacade.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
@@ -5748,7 +5801,6 @@ ProtocolPluginFacade.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -5758,6 +5810,8 @@ ProtocolPluginFacade.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"EndpointFactoryManager.h" \
"TraceLevels.h" \
"DefaultsAndOverrides.h" \
@@ -5821,13 +5875,15 @@ Proxy.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"ProxyFactory.h" \
"$(includedir)\Ice\OutgoingAsyncF.h" \
"$(includedir)\Ice\Properties.h" \
@@ -5839,8 +5895,9 @@ Proxy.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"ReferenceFactory.h" \
"ReferenceFactoryF.h" \
"Reference.h" \
@@ -5890,7 +5947,6 @@ Proxy.obj: \
"$(includedir)\Ice\Plugin.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Process.h" \
"RouterInfo.h" \
"$(includedir)\Ice\Router.h" \
@@ -5902,6 +5958,7 @@ Proxy.obj: \
"EventHandlerF.h" \
"Network.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -5968,13 +6025,15 @@ ProxyFactory.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -5983,8 +6042,9 @@ ProxyFactory.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -6016,7 +6076,6 @@ ProxyFactory.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"ReferenceFactory.h" \
@@ -6096,13 +6155,15 @@ Reference.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LocatorF.h" \
"RouterInfoF.h" \
"LocatorInfoF.h" \
@@ -6118,10 +6179,10 @@ Reference.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"ReferenceFactory.h" \
- "$(includedir)\Ice\LocalException.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -6165,8 +6226,6 @@ Reference.obj: \
"$(includedir)\Ice\Comparable.h" \
"LocatorInfo.h" \
"$(includedir)\Ice\Locator.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"$(includedir)\Ice\Functional.h" \
"$(includedir)\IceUtil\Functional.h" \
"ConnectionI.h" \
@@ -6175,6 +6234,7 @@ Reference.obj: \
"EventHandler.h" \
"EventHandlerF.h" \
"Network.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -6248,13 +6308,15 @@ ReferenceFactory.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -6263,15 +6325,17 @@ ReferenceFactory.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\InstrumentationF.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
"$(includedir)\Ice\ImplicitContextF.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\FacetMap.h" \
"ReferenceFactory.h" \
"ReferenceFactoryF.h" \
@@ -6284,7 +6348,6 @@ ReferenceFactory.obj: \
"SharedContext.h" \
"ProxyFactory.h" \
"$(includedir)\Ice\OutgoingAsyncF.h" \
- "$(includedir)\Ice\LocalException.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -6321,6 +6384,7 @@ ReferenceFactory.obj: \
"EventHandlerF.h" \
"Network.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"RequestHandler.h" \
"ResponseHandler.h" \
"$(includedir)\Ice\ConnectionAsync.h" \
@@ -6331,8 +6395,6 @@ ReferenceFactory.obj: \
"$(includedir)\Ice\Comparable.h" \
"LocatorInfo.h" \
"$(includedir)\Ice\Locator.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"DefaultsAndOverrides.h" \
@@ -6401,17 +6463,18 @@ RegisterPluginsInit.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Plugin.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
@@ -6478,13 +6541,15 @@ RequestHandler.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LocatorF.h" \
"RouterInfoF.h" \
"LocatorInfoF.h" \
@@ -6500,8 +6565,9 @@ RequestHandler.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
RequestHandlerFactory.obj: \
RequestHandlerFactory.cpp \
@@ -6552,6 +6618,7 @@ RequestHandlerFactory.obj: \
"$(includedir)\Ice\Version.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "VirtualShared.h" \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
@@ -6559,8 +6626,8 @@ RequestHandlerFactory.obj: \
"$(includedir)\Ice\Current.h" \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -6597,6 +6664,8 @@ RequestHandlerFactory.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"RouterInfo.h" \
"$(includedir)\Ice\Router.h" \
@@ -6665,6 +6734,7 @@ ResponseHandler.obj: \
"$(includedir)\Ice\Version.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "VirtualShared.h" \
RetryQueue.obj: \
RetryQueue.cpp \
@@ -6726,8 +6796,8 @@ RetryQueue.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -6777,6 +6847,8 @@ RetryQueue.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"TraceLevels.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
@@ -6841,13 +6913,15 @@ RouterInfo.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -6855,10 +6929,10 @@ RouterInfo.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"EndpointIF.h" \
"$(includedir)\Ice\Comparable.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\Functional.h" \
@@ -6938,18 +7012,21 @@ Selector.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
"EventHandlerF.h" \
"EventHandler.h" \
"$(includedir)\Ice\ThreadPoolF.h" \
+ "VirtualShared.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -6965,7 +7042,6 @@ Selector.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"IPEndpointIF.h" \
@@ -6978,7 +7054,6 @@ Selector.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -6988,6 +7063,8 @@ Selector.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
@@ -7074,8 +7151,8 @@ ServantManager.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -7102,6 +7179,8 @@ ServantManager.obj: \
"$(includedir)\Ice\Value.h" \
"$(includedir)\Ice\Incoming.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\IceUtil\StringUtil.h" \
Service.obj: \
@@ -7128,6 +7207,7 @@ Service.obj: \
"$(includedir)\Ice\Ice.h" \
"$(includedir)\IceUtil\PushDisableWarnings.h" \
"$(includedir)\Ice\Config.h" \
+ "$(includedir)\Ice\Comparable.h" \
"$(includedir)\Ice\DeprecatedStringConverter.h" \
"$(includedir)\Ice\CommunicatorF.h" \
"$(includedir)\Ice\ProxyF.h" \
@@ -7175,17 +7255,17 @@ Service.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -7195,13 +7275,14 @@ Service.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\RemoteLogger.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"$(includedir)\Ice\Communicator.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -7230,6 +7311,7 @@ Service.obj: \
"$(includedir)\Ice\SliceChecksums.h" \
"$(includedir)\Ice\SliceChecksumDict.h" \
"$(includedir)\Ice\RegisterPlugins.h" \
+ "$(includedir)\Ice\InterfaceByValue.h" \
"LoggerI.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
@@ -7333,8 +7415,8 @@ SlicedData.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\InstanceF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
@@ -7398,13 +7480,15 @@ Stream.obj: \
"$(includedir)\Ice\Instrumentation.h" \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\IceUtil\StringConverter.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
StreamI.obj: \
StreamI.cpp \
@@ -7465,13 +7549,15 @@ StreamI.obj: \
"$(includedir)\Ice\Instrumentation.h" \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\IceUtil\StringConverter.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -7488,7 +7574,6 @@ StreamI.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
@@ -7505,7 +7590,6 @@ StreamI.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -7515,6 +7599,8 @@ StreamI.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"DefaultsAndOverrides.h" \
"Network.h" \
"ProtocolInstanceF.h" \
@@ -7581,13 +7667,15 @@ StreamSocket.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
"NetworkProxy.h" \
@@ -7611,7 +7699,6 @@ StreamSocket.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -7623,7 +7710,6 @@ StreamSocket.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -7633,6 +7719,8 @@ StreamSocket.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
StringConverterPlugin.obj: \
StringConverterPlugin.cpp \
@@ -7706,13 +7794,14 @@ StringConverterPlugin.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\Ice\Value.h" \
"$(includedir)\Ice\Incoming.h" \
@@ -7720,7 +7809,10 @@ StringConverterPlugin.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\InstrumentationF.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -7732,7 +7824,6 @@ StringConverterPlugin.obj: \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\Dispatcher.h" \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
@@ -7803,13 +7894,15 @@ TcpAcceptor.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"TcpTransceiver.h" \
"Transceiver.h" \
@@ -7834,7 +7927,6 @@ TcpAcceptor.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -7846,7 +7938,6 @@ TcpAcceptor.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -7856,6 +7947,8 @@ TcpAcceptor.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"HttpParser.h" \
"TcpEndpointI.h" \
"IPEndpointI.h" \
@@ -7936,13 +8029,15 @@ TcpConnector.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"TcpTransceiver.h" \
"Transceiver.h" \
@@ -7967,7 +8062,6 @@ TcpConnector.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -7979,7 +8073,6 @@ TcpConnector.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -7989,6 +8082,8 @@ TcpConnector.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"HttpParser.h" \
"TcpEndpointI.h" \
"IPEndpointI.h" \
@@ -8073,13 +8168,14 @@ TcpEndpointI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
"EndpointFactory.h" \
@@ -8111,7 +8207,6 @@ TcpEndpointI.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -8121,6 +8216,8 @@ TcpEndpointI.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"TcpAcceptor.h" \
"Acceptor.h" \
"TcpConnector.h" \
@@ -8198,13 +8295,15 @@ TcpTransceiver.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"StreamSocket.h" \
"WSTransceiver.h" \
@@ -8227,7 +8326,6 @@ TcpTransceiver.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -8239,7 +8337,6 @@ TcpTransceiver.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -8249,6 +8346,8 @@ TcpTransceiver.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"HttpParser.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
@@ -8316,23 +8415,24 @@ ThreadPool.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"EventHandler.h" \
"EventHandlerF.h" \
"Network.h" \
"NetworkF.h" \
"NetworkProxyF.h" \
"ProtocolInstanceF.h" \
+ "VirtualShared.h" \
"Selector.h" \
"$(includedir)\IceUtil\StringUtil.h" \
- "$(includedir)\Ice\LocalException.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -8367,6 +8467,8 @@ ThreadPool.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"ObjectAdapterFactory.h" \
@@ -8440,13 +8542,15 @@ TraceLevels.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -8456,8 +8560,9 @@ TraceLevels.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
TraceUtil.obj: \
TraceUtil.cpp \
@@ -8535,15 +8640,16 @@ TraceUtil.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\PropertiesF.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
@@ -8559,7 +8665,6 @@ TraceUtil.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -8568,6 +8673,8 @@ TraceUtil.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"TraceLevels.h" \
"$(includedir)\Ice\Logger.h" \
"ReplyStatus.h" \
@@ -8636,13 +8743,15 @@ Transceiver.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
@@ -8712,13 +8821,15 @@ UdpConnector.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstance.h" \
"EndpointIF.h" \
@@ -8739,7 +8850,6 @@ UdpConnector.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -8751,7 +8861,6 @@ UdpConnector.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -8761,6 +8870,8 @@ UdpConnector.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"UdpTransceiver.h" \
"Transceiver.h" \
"UdpEndpointI.h" \
@@ -8842,13 +8953,14 @@ UdpEndpointI.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\LoggerF.h" \
"ProtocolInstanceF.h" \
"EndpointFactory.h" \
@@ -8858,7 +8970,6 @@ UdpEndpointI.obj: \
"Connector.h" \
"UdpTransceiver.h" \
"Transceiver.h" \
- "$(includedir)\Ice\LocalException.h" \
"ProtocolInstance.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
@@ -8893,6 +9004,8 @@ UdpEndpointI.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"HashUtil.h" \
"$(includedir)\Ice\Logger.h" \
@@ -8962,13 +9075,15 @@ UdpTransceiver.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"UdpEndpointI.h" \
"IPEndpointI.h" \
@@ -8976,7 +9091,6 @@ UdpTransceiver.obj: \
"IPEndpointIF.h" \
"EndpointI.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"ConnectorF.h" \
"AcceptorF.h" \
"EndpointFactory.h" \
@@ -9007,7 +9121,6 @@ UdpTransceiver.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -9017,6 +9130,8 @@ UdpTransceiver.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\Properties.h" \
@@ -9024,6 +9139,53 @@ UdpTransceiver.obj: \
"$(includedir)\Ice\PropertiesAdmin.h" \
"$(includedir)\IceUtil\StringUtil.h" \
+ValueFactoryManager.obj: \
+ ValueFactoryManager.cpp \
+ "ValueFactoryManager.h" \
+ "$(includedir)\IceUtil\Shared.h" \
+ "$(includedir)\IceUtil\Config.h" \
+ "$(includedir)\IceUtil\Atomic.h" \
+ "$(includedir)\IceUtil\Mutex.h" \
+ "$(includedir)\IceUtil\Lock.h" \
+ "$(includedir)\IceUtil\ThreadException.h" \
+ "$(includedir)\IceUtil\Exception.h" \
+ "$(includedir)\IceUtil\Time.h" \
+ "$(includedir)\IceUtil\MutexProtocol.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
+ "$(includedir)\Ice\Handle.h" \
+ "$(includedir)\IceUtil\Handle.h" \
+ "$(includedir)\Ice\Config.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\IceUtil\PushDisableWarnings.h" \
+ "$(includedir)\Ice\ProxyF.h" \
+ "$(includedir)\Ice\ProxyHandle.h" \
+ "$(includedir)\Ice\ObjectF.h" \
+ "$(includedir)\Ice\ValueF.h" \
+ "$(includedir)\Ice\Exception.h" \
+ "$(includedir)\Ice\Format.h" \
+ "$(includedir)\Ice\StreamF.h" \
+ "$(includedir)\Ice\LocalObject.h" \
+ "$(includedir)\Ice\LocalObjectF.h" \
+ "$(includedir)\Ice\StreamHelpers.h" \
+ "$(includedir)\IceUtil\ScopedArray.h" \
+ "$(includedir)\IceUtil\Iterator.h" \
+ "$(includedir)\Ice\Traits.h" \
+ "$(includedir)\IceUtil\Optional.h" \
+ "$(includedir)\IceUtil\UndefSysMacros.h" \
+ "$(includedir)\IceUtil\PopDisableWarnings.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
+ "$(includedir)\Ice\Object.h" \
+ "$(includedir)\Ice\IncomingAsyncF.h" \
+ "$(includedir)\Ice\Current.h" \
+ "$(includedir)\Ice\ObjectAdapterF.h" \
+ "$(includedir)\Ice\ConnectionF.h" \
+ "$(includedir)\Ice\Identity.h" \
+ "$(includedir)\Ice\Version.h" \
+ "$(includedir)\Ice\Functional.h" \
+ "$(includedir)\IceUtil\Functional.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
+
WSAcceptor.obj: \
WSAcceptor.cpp \
"WSAcceptor.h" \
@@ -9091,13 +9253,15 @@ WSAcceptor.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"ProtocolInstanceF.h" \
"ProtocolInstance.h" \
"ConnectorF.h" \
@@ -9118,7 +9282,6 @@ WSAcceptor.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -9130,7 +9293,6 @@ WSAcceptor.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -9140,6 +9302,8 @@ WSAcceptor.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"WSTransceiver.h" \
"HttpParser.h" \
"Transceiver.h" \
@@ -9213,13 +9377,15 @@ WSConnector.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"EndpointIF.h" \
"IPEndpointIF.h" \
"NetworkF.h" \
@@ -9239,7 +9405,6 @@ WSConnector.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -9252,7 +9417,6 @@ WSConnector.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -9262,6 +9426,8 @@ WSConnector.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"WSTransceiver.h" \
"HttpParser.h" \
"Transceiver.h" \
@@ -9345,13 +9511,14 @@ WSEndpoint.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
"NetworkF.h" \
"Instance.h" \
"$(includedir)\IceUtil\RecMutex.h" \
@@ -9379,7 +9546,6 @@ WSEndpoint.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -9389,6 +9555,8 @@ WSEndpoint.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"WSAcceptor.h" \
"Acceptor.h" \
"Network.h" \
@@ -9459,13 +9627,15 @@ WSTransceiver.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\LoggerF.h" \
"EndpointIF.h" \
"ConnectorF.h" \
@@ -9487,7 +9657,6 @@ WSTransceiver.obj: \
"$(includedir)\Ice\ACMF.h" \
"$(includedir)\Ice\Connection.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ObjectAdapterFactoryF.h" \
"EndpointFactoryManagerF.h" \
"RetryQueueF.h" \
@@ -9500,7 +9669,6 @@ WSTransceiver.obj: \
"$(includedir)\Ice\BatchRequestInterceptor.h" \
"ImplicitContextI.h" \
"$(includedir)\Ice\ImplicitContext.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Process.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -9510,12 +9678,15 @@ WSTransceiver.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"HttpParser.h" \
"Transceiver.h" \
"TransceiverF.h" \
"Network.h" \
"$(includedir)\Ice\Communicator.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\ImplicitContextF.h" \
@@ -9565,6 +9736,7 @@ DLLMain.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Service.h" \
"$(includedir)\Ice\Ice.h" \
+ "$(includedir)\Ice\Comparable.h" \
"$(includedir)\Ice\DeprecatedStringConverter.h" \
"$(includedir)\Ice\CommunicatorF.h" \
"$(includedir)\IceUtil\StringConverter.h" \
@@ -9598,8 +9770,8 @@ DLLMain.obj: \
"$(includedir)\Ice\BasicStream.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -9617,13 +9789,14 @@ DLLMain.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\Logger.h" \
"$(includedir)\Ice\LoggerUtil.h" \
"$(includedir)\Ice\RemoteLogger.h" \
- "$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
"$(includedir)\Ice\Communicator.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
@@ -9651,6 +9824,7 @@ DLLMain.obj: \
"$(includedir)\Ice\SliceChecksums.h" \
"$(includedir)\Ice\SliceChecksumDict.h" \
"$(includedir)\Ice\RegisterPlugins.h" \
+ "$(includedir)\Ice\InterfaceByValue.h" \
BuiltinSequences.obj: \
BuiltinSequences.cpp \
@@ -9694,8 +9868,8 @@ BuiltinSequences.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -9760,13 +9934,15 @@ Communicator.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -9775,17 +9951,18 @@ Communicator.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\LoggerF.h" \
"$(includedir)\Ice\InstrumentationF.h" \
+ "$(includedir)\Ice\ObjectFactory.h" \
"$(includedir)\Ice\RouterF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\PluginF.h" \
"$(includedir)\Ice\ImplicitContextF.h" \
"$(includedir)\Ice\Properties.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\FacetMap.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -9878,15 +10055,16 @@ Connection.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
- "$(includedir)\Ice\Endpoint.h" \
+ "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\Endpoint.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
"$(includedir)\IceUtil\Thread.h" \
@@ -9961,8 +10139,8 @@ Current.obj: \
"$(includedir)\IceUtil\Time.h" \
"$(includedir)\IceUtil\MutexProtocol.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10013,8 +10191,8 @@ Endpoint.obj: \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10119,8 +10297,8 @@ FacetMap.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10168,8 +10346,8 @@ Identity.obj: \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10220,8 +10398,8 @@ ImplicitContext.obj: \
"$(includedir)\IceUtil\Time.h" \
"$(includedir)\IceUtil\MutexProtocol.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10299,8 +10477,8 @@ Instrumentation.obj: \
"$(includedir)\IceUtil\Time.h" \
"$(includedir)\IceUtil\MutexProtocol.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10378,8 +10556,8 @@ LocalException.obj: \
"$(includedir)\Ice\Current.h" \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10444,13 +10622,15 @@ Locator.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -10460,10 +10640,8 @@ Locator.obj: \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
"$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Process.h" \
- "$(includedir)\Ice\LocalException.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -10528,13 +10706,15 @@ LocatorF.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
Logger.obj: \
Logger.cpp \
@@ -10650,13 +10830,15 @@ Metrics.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -10665,9 +10847,7 @@ Metrics.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
- "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -10732,18 +10912,19 @@ ObjectAdapter.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\LocatorF.h" \
"$(includedir)\Ice\FacetMap.h" \
"$(includedir)\Ice\Endpoint.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
ObjectAdapterF.obj: \
ObjectAdapterF.cpp \
@@ -10815,7 +10996,8 @@ ObjectFactory.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10866,8 +11048,8 @@ Plugin.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -10960,13 +11142,15 @@ Process.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -10974,8 +11158,8 @@ Process.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
- "$(includedir)\Ice\LocalException.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -11040,13 +11224,15 @@ ProcessF.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
Properties.obj: \
Properties.cpp \
@@ -11106,13 +11292,15 @@ Properties.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -11121,9 +11309,9 @@ Properties.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\PropertiesAdmin.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
- "$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -11188,13 +11376,15 @@ PropertiesAdmin.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -11203,8 +11393,8 @@ PropertiesAdmin.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\IncomingAsync.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
- "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -11269,13 +11459,15 @@ PropertiesF.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
RemoteLogger.obj: \
RemoteLogger.cpp \
@@ -11335,13 +11527,15 @@ RemoteLogger.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -11350,9 +11544,7 @@ RemoteLogger.obj: \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
"$(includedir)\Ice\FactoryTableInit.h" \
- "$(includedir)\Ice\DefaultObjectFactory.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
- "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -11417,13 +11609,15 @@ Router.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
"$(includedir)\IceUtil\MutexPtrLock.h" \
"$(includedir)\Ice\Value.h" \
@@ -11431,8 +11625,8 @@ Router.obj: \
"$(includedir)\Ice\ServantLocatorF.h" \
"$(includedir)\Ice\ServantManagerF.h" \
"$(includedir)\Ice\ResponseHandlerF.h" \
- "$(includedir)\Ice\BuiltinSequences.h" \
- "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\FactoryTableInit.h" \
+ "$(includedir)\Ice\DefaultValueFactory.h" \
"$(includedir)\Ice\Outgoing.h" \
"$(includedir)\Ice\OutgoingAsync.h" \
"$(includedir)\IceUtil\Timer.h" \
@@ -11497,13 +11691,15 @@ RouterF.obj: \
"$(includedir)\IceUtil\StringConverter.h" \
"$(includedir)\Ice\Object.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\LocalException.h" \
+ "$(includedir)\Ice\BuiltinSequences.h" \
ServantLocator.obj: \
ServantLocator.cpp \
@@ -11547,8 +11743,8 @@ ServantLocator.obj: \
"$(includedir)\IceUtil\Time.h" \
"$(includedir)\IceUtil\MutexProtocol.h" \
"$(includedir)\Ice\IncomingAsyncF.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -11625,8 +11821,57 @@ SliceChecksumDict.obj: \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
"$(includedir)\Ice\Version.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
+ "$(includedir)\Ice\Buffer.h" \
+ "$(includedir)\Ice\Protocol.h" \
+ "$(includedir)\Ice\SlicedDataF.h" \
+ "$(includedir)\Ice\UserExceptionFactory.h" \
+ "$(includedir)\Ice\FactoryTable.h" \
+
+ValueFactory.obj: \
+ ValueFactory.cpp \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\IceUtil\PushDisableWarnings.h" \
+ "$(includedir)\Ice\ProxyF.h" \
+ "$(includedir)\IceUtil\Shared.h" \
+ "$(includedir)\IceUtil\Config.h" \
+ "$(includedir)\IceUtil\Atomic.h" \
+ "$(includedir)\Ice\Config.h" \
+ "$(includedir)\Ice\ProxyHandle.h" \
+ "$(includedir)\IceUtil\Handle.h" \
+ "$(includedir)\IceUtil\Exception.h" \
+ "$(includedir)\Ice\ObjectF.h" \
+ "$(includedir)\Ice\Handle.h" \
+ "$(includedir)\Ice\ValueF.h" \
+ "$(includedir)\Ice\Exception.h" \
+ "$(includedir)\Ice\Format.h" \
+ "$(includedir)\Ice\StreamF.h" \
+ "$(includedir)\Ice\LocalObject.h" \
+ "$(includedir)\Ice\LocalObjectF.h" \
+ "$(includedir)\Ice\StreamHelpers.h" \
+ "$(includedir)\IceUtil\ScopedArray.h" \
+ "$(includedir)\IceUtil\Iterator.h" \
+ "$(includedir)\Ice\Traits.h" \
+ "$(includedir)\IceUtil\Optional.h" \
+ "$(includedir)\IceUtil\UndefSysMacros.h" \
+ "$(includedir)\IceUtil\PopDisableWarnings.h" \
+ "$(includedir)\Ice\BasicStream.h" \
+ "$(includedir)\IceUtil\StringConverter.h" \
+ "$(includedir)\Ice\InstanceF.h" \
+ "$(includedir)\Ice\Object.h" \
+ "$(includedir)\IceUtil\Mutex.h" \
+ "$(includedir)\IceUtil\Lock.h" \
+ "$(includedir)\IceUtil\ThreadException.h" \
+ "$(includedir)\IceUtil\Time.h" \
+ "$(includedir)\IceUtil\MutexProtocol.h" \
+ "$(includedir)\Ice\IncomingAsyncF.h" \
+ "$(includedir)\Ice\Current.h" \
+ "$(includedir)\Ice\ObjectAdapterF.h" \
+ "$(includedir)\Ice\ConnectionF.h" \
+ "$(includedir)\Ice\Identity.h" \
+ "$(includedir)\Ice\Version.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
@@ -11674,8 +11919,8 @@ Version.obj: \
"$(includedir)\Ice\ObjectAdapterF.h" \
"$(includedir)\Ice\ConnectionF.h" \
"$(includedir)\Ice\Identity.h" \
- "$(includedir)\Ice\ObjectFactory.h" \
- "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+ "$(includedir)\Ice\ValueFactory.h" \
+ "$(includedir)\Ice\ValueFactoryManagerF.h" \
"$(includedir)\Ice\Buffer.h" \
"$(includedir)\Ice\Protocol.h" \
"$(includedir)\Ice\SlicedDataF.h" \
diff --git a/cpp/src/Ice/.gitignore b/cpp/src/Ice/.gitignore
index abeb5e2cf37..39ff616d0f3 100644
--- a/cpp/src/Ice/.gitignore
+++ b/cpp/src/Ice/.gitignore
@@ -39,6 +39,7 @@ Router.cpp
ServantLocatorF.cpp
ServantLocator.cpp
SliceChecksumDict.cpp
+ValueFactory.cpp
Version.cpp
BuiltinSequences.h
CommunicatorF.h
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index d60a31abc54..7dabb6cd7e4 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -14,8 +14,8 @@
#include <Ice/Object.h>
#include <Ice/Proxy.h>
#include <Ice/ProxyFactory.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/ObjectFactoryManager.h>
+#include <Ice/ValueFactory.h>
+#include <Ice/ValueFactoryManager.h>
#include <Ice/UserExceptionFactory.h>
#include <Ice/LocalException.h>
#include <Ice/Protocol.h>
@@ -1855,7 +1855,7 @@ IceInternal::BasicStream::initReadEncaps()
if(!_currentReadEncaps->decoder) // Lazy initialization.
{
- ObjectFactoryManagerPtr factoryManager = _instance->servantFactoryManager();
+ ValueFactoryManagerPtr factoryManager = _instance->servantFactoryManager();
if(_currentReadEncaps->encoding == Encoding_1_0)
{
_currentReadEncaps->decoder = new EncapsDecoder10(this, _currentReadEncaps, _sliceObjects, factoryManager);
@@ -1931,7 +1931,7 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId)
v = userFactory(typeId);
}
#else
- ObjectFactoryPtr userFactory = _servantFactoryManager->find(typeId);
+ ValueFactoryPtr userFactory = _servantFactoryManager->find(typeId);
if(userFactory)
{
v = userFactory->create(typeId);
@@ -1961,14 +1961,14 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId)
if(!v)
{
#ifdef ICE_CPP11_MAPPING
- function<ValuePtr (const string&)> of = IceInternal::factoryTable->getObjectFactory(typeId);
+ function<ValuePtr (const string&)> of = IceInternal::factoryTable->getValueFactory(typeId);
if(of)
{
v = of(typeId);
assert(v);
}
#else
- ObjectFactoryPtr of = IceInternal::factoryTable->getObjectFactory(typeId);
+ ValueFactoryPtr of = IceInternal::factoryTable->getValueFactory(typeId);
if(of)
{
v = of->create(typeId);
@@ -2382,7 +2382,7 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance()
//
if(_typeId == Object::ice_staticId())
{
- throw NoObjectFactoryException(__FILE__, __LINE__, "", mostDerivedId);
+ throw NoValueFactoryException(__FILE__, __LINE__, "", mostDerivedId);
}
v = newInstance(_typeId);
@@ -2400,7 +2400,7 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance()
//
if(!_sliceObjects)
{
- throw NoObjectFactoryException(__FILE__, __LINE__, "no object factory found and object slicing is disabled",
+ throw NoValueFactoryException(__FILE__, __LINE__, "no value factory found and object slicing is disabled",
_typeId);
}
@@ -2700,8 +2700,8 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice()
{
if(_current->sliceType == ObjectSlice)
{
- throw NoObjectFactoryException(__FILE__, __LINE__,
- "no object factory found and compact format prevents "
+ throw NoValueFactoryException(__FILE__, __LINE__,
+ "no value factory found and compact format prevents "
"slicing (the sender should use the sliced format instead)",
_current->typeId);
}
@@ -2867,7 +2867,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat
//
if(!_sliceObjects)
{
- throw NoObjectFactoryException(__FILE__, __LINE__, "no object factory found and object slicing is disabled",
+ throw NoValueFactoryException(__FILE__, __LINE__, "no value factory found and object slicing is disabled",
_current->typeId);
}
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 4fddd5e9e62..a4ef7486333 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -13,7 +13,7 @@
#include <Ice/ConnectionFactory.h>
#include <Ice/ReferenceFactory.h>
#include <Ice/ProxyFactory.h>
-#include <Ice/ObjectFactoryManager.h>
+#include <Ice/ValueFactoryManager.h>
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/LoggerUtil.h>
#include <Ice/LocalException.h>
@@ -129,27 +129,39 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout
return _instance->objectAdapterFactory()->createObjectAdapter(oaName, router);
}
+void
+Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id)
+{
+ _instance->servantFactoryManager()->add(factory, id);
+}
+
+::Ice::ObjectFactoryPtr
+Ice::CommunicatorI::findObjectFactory(const string& id) const
+{
+ return _instance->servantFactoryManager()->findObjectFactory(id);
+}
+
#ifdef ICE_CPP11_MAPPING
void
-Ice::CommunicatorI::addObjectFactory(function<::Ice::ValuePtr (const string&)> factory, const string& id)
+Ice::CommunicatorI::addValueFactory(function<::Ice::ValuePtr (const string&)> factory, const string& id)
{
_instance->servantFactoryManager()->add(move(factory), id);
}
function<::Ice::ValuePtr (const string&)>
-Ice::CommunicatorI::findObjectFactory(const string& id) const
+Ice::CommunicatorI::findValueFactory(const string& id) const
{
return _instance->servantFactoryManager()->find(id);
}
#else
void
-Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id)
+Ice::CommunicatorI::addValueFactory(const ::Ice::ValueFactoryPtr& factory, const string& id)
{
_instance->servantFactoryManager()->add(factory, id);
}
-::Ice::ObjectFactoryPtr
-Ice::CommunicatorI::findObjectFactory(const string& id) const
+::Ice::ValueFactoryPtr
+Ice::CommunicatorI::findValueFactory(const string& id) const
{
return _instance->servantFactoryManager()->find(id);
}
@@ -243,16 +255,16 @@ Ice::CommunicatorI::flushBatchRequests_async(
class FlushBatchRequestsCallback : public CallbackBase
{
public:
-
+
FlushBatchRequestsCallback(function<void (exception_ptr)> exception,
- function<void (bool)> sent,
+ function<void (bool)> sent,
shared_ptr<Communicator> communicator) :
_exception(move(exception)),
_sent(move(sent)),
_communicator(move(communicator))
{
}
-
+
virtual void sent(const AsyncResultPtr& result) const
{
try
@@ -264,19 +276,19 @@ Ice::CommunicatorI::flushBatchRequests_async(
{
_exception(current_exception());
}
-
+
if(_sent)
{
_sent(result->sentSynchronously());
}
}
-
+
virtual bool hasSentCallback() const
{
return true;
}
-
+
virtual void
completed(const ::Ice::AsyncResultPtr& result) const
{
@@ -297,15 +309,15 @@ Ice::CommunicatorI::flushBatchRequests_async(
function<void (bool)> _sent;
shared_ptr<Communicator> _communicator;
};
-
+
OutgoingConnectionFactoryPtr connectionFactory = _instance->outgoingConnectionFactory();
ObjectAdapterFactoryPtr adapterFactory = _instance->objectAdapterFactory();
-
+
auto self = dynamic_pointer_cast<CommunicatorI>(shared_from_this());
-
+
auto result = make_shared<CommunicatorFlushBatchAsync>(self, _instance, __flushBatchRequests_name,
make_shared<FlushBatchRequestsCallback>(move(exception), move(sent), self));
-
+
connectionFactory->flushAsyncBatchRequests(result);
adapterFactory->flushAsyncBatchRequests(result);
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index d0ba4285695..277d573b04b 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -46,12 +46,15 @@ public:
virtual ObjectAdapterPtr createObjectAdapterWithEndpoints(const std::string&, const std::string&);
virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrxPtr&);
-#ifdef ICE_CPP11_MAPPING
- virtual void addObjectFactory(std::function<std::shared_ptr<Ice::Value> (const std::string&)>, const std::string&);
- virtual std::function<::std::shared_ptr<Ice::Value> (const std::string&)> findObjectFactory(const std::string&) const;
-#else
virtual void addObjectFactory(const ObjectFactoryPtr&, const std::string&);
virtual ObjectFactoryPtr findObjectFactory(const std::string&) const;
+
+#ifdef ICE_CPP11_MAPPING
+ virtual void addValueFactory(std::function<std::shared_ptr<Ice::Value> (const std::string&)>, const std::string&);
+ virtual std::function<::std::shared_ptr<Ice::Value> (const std::string&)> findValueFactory(const std::string&) const;
+#else
+ virtual void addValueFactory(const ValueFactoryPtr&, const std::string&);
+ virtual ValueFactoryPtr findValueFactory(const std::string&) const;
#endif
virtual ImplicitContextPtr getImplicitContext() const;
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index d23255ef4ab..20203c94d52 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -70,13 +70,13 @@ throwUOE(const string& expectedType, const ValuePtr& v)
{
//
// If the object is an unknown sliced object, we didn't find an
- // object factory, in this case raise a NoObjectFactoryException
+ // value factory, in this case raise a NoValueFactoryException
// instead.
//
UnknownSlicedObject* uso = dynamic_cast<UnknownSlicedObject*>(v.get());
if(uso)
{
- throw NoObjectFactoryException(__FILE__, __LINE__, "", uso->getUnknownTypeId());
+ throw NoValueFactoryException(__FILE__, __LINE__, "", uso->getUnknownTypeId());
}
string type = v->ice_id();
@@ -698,7 +698,7 @@ Ice::UnmarshalOutOfBoundsException::ice_print(ostream& out) const
}
void
-Ice::NoObjectFactoryException::ice_print(ostream& out) const
+Ice::NoValueFactoryException::ice_print(ostream& out) const
{
Exception::ice_print(out);
out << ":\nprotocol error: no suitable object factory found for `" << type << "'";
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index bc48ab8d6e9..680f19aa241 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -8,7 +8,7 @@
// **********************************************************************
#include <Ice/FactoryTable.h>
-#include <Ice/ObjectFactory.h>
+#include <Ice/ValueFactory.h>
using namespace std;
@@ -64,22 +64,22 @@ IceInternal::FactoryTable::removeExceptionFactory(const string& t)
}
//
-// Add a factory to the object factory table.
+// Add a factory to the value factory table.
//
#ifdef ICE_CPP11_MAPPING
void
-IceInternal::FactoryTable::addObjectFactory(const string& t, function<::Ice::ValuePtr (const string&)> f)
+IceInternal::FactoryTable::addValueFactory(const string& t, function<::Ice::ValuePtr (const string&)> f)
#else
void
-IceInternal::FactoryTable::addObjectFactory(const string& t, const ::Ice::ObjectFactoryPtr& f)
+IceInternal::FactoryTable::addValueFactory(const string& t, const ::Ice::ValueFactoryPtr& f)
#endif
{
IceUtil::Mutex::Lock lock(_m);
assert(f);
- OFTable::iterator i = _oft.find(t);
- if(i == _oft.end())
+ VFTable::iterator i = _vft.find(t);
+ if(i == _vft.end())
{
- _oft[t] = OFPair(f, 1);
+ _vft[t] = VFPair(f, 1);
}
else
{
@@ -88,48 +88,48 @@ IceInternal::FactoryTable::addObjectFactory(const string& t, const ::Ice::Object
}
//
-// Return the object factory for a given type ID
+// Return the value factory for a given type ID
//
#ifdef ICE_CPP11_MAPPING
function<Ice::ValuePtr(const string&)>
-IceInternal::FactoryTable::getObjectFactory(const string& t) const
+IceInternal::FactoryTable::getValueFactory(const string& t) const
{
IceUtil::Mutex::Lock lock(_m);
- OFTable::const_iterator i = _oft.find(t);
- return i != _oft.end() ? i->second.first : nullptr;
+ VFTable::const_iterator i = _vft.find(t);
+ return i != _vft.end() ? i->second.first : nullptr;
}
#else
-Ice::ObjectFactoryPtr
-IceInternal::FactoryTable::getObjectFactory(const string& t) const
+Ice::ValueFactoryPtr
+IceInternal::FactoryTable::getValueFactory(const string& t) const
{
IceUtil::Mutex::Lock lock(_m);
- OFTable::const_iterator i = _oft.find(t);
- return i != _oft.end() ? i->second.first : Ice::ObjectFactoryPtr();
+ VFTable::const_iterator i = _vft.find(t);
+ return i != _vft.end() ? i->second.first : Ice::ValueFactoryPtr();
}
#endif
//
-// Remove a factory from the object factory table. If the factory
+// Remove a factory from the value factory table. If the factory
// is not present, do nothing; otherwise, decrement the factory's
// reference count if the count drops to zero, remove the factory's
// entry from the table.
//
void
-IceInternal::FactoryTable::removeObjectFactory(const string& t)
+IceInternal::FactoryTable::removeValueFactory(const string& t)
{
IceUtil::Mutex::Lock lock(_m);
- OFTable::iterator i = _oft.find(t);
- if(i != _oft.end())
+ VFTable::iterator i = _vft.find(t);
+ if(i != _vft.end())
{
if(--i->second.second == 0)
{
- _oft.erase(i);
+ _vft.erase(i);
}
}
}
//
-// Add a factory to the object factory table.
+// Add a factory to the value factory table.
//
void
IceInternal::FactoryTable::addTypeId(int compactId, const string& typeId)
diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp
index 9b1675e17c4..c440e35134d 100644
--- a/cpp/src/Ice/FactoryTableInit.cpp
+++ b/cpp/src/Ice/FactoryTableInit.cpp
@@ -90,6 +90,6 @@ IceInternal::CompactIdInit::CompactIdInit(const char* typeId, int compactId) :
IceInternal::CompactIdInit::~CompactIdInit()
{
- factoryTable->removeTypeId(_compactId);
+ factoryTable->removeTypeId(_compactId);
}
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index f3f8e2d768d..4952c61d152 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -18,7 +18,7 @@
#include <Ice/ProxyFactory.h>
#include <Ice/ThreadPool.h>
#include <Ice/ConnectionFactory.h>
-#include <Ice/ObjectFactoryManager.h>
+#include <Ice/ValueFactoryManager.h>
#include <Ice/LocalException.h>
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/Exception.h>
@@ -396,7 +396,7 @@ IceInternal::Instance::outgoingConnectionFactory() const
return _outgoingConnectionFactory;
}
-ObjectFactoryManagerPtr
+ValueFactoryManagerPtr
IceInternal::Instance::servantFactoryManager() const
{
Lock sync(*this);
@@ -1351,7 +1351,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
_outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this);
- _servantFactoryManager = new ObjectFactoryManager();
+ _servantFactoryManager = new ValueFactoryManager();
_objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator);
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 32685e2e9b5..2f352cc61dd 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -28,7 +28,7 @@
#include <Ice/ThreadPoolF.h>
#include <Ice/ConnectionFactoryF.h>
#include <Ice/ACM.h>
-#include <Ice/ObjectFactoryManagerF.h>
+#include <Ice/ValueFactoryManagerF.h>
#include <Ice/ObjectAdapterFactoryF.h>
#include <Ice/EndpointFactoryManagerF.h>
#include <Ice/IPEndpointIF.h>
@@ -95,7 +95,7 @@ public:
RequestHandlerFactoryPtr requestHandlerFactory() const;
ProxyFactoryPtr proxyFactory() const;
OutgoingConnectionFactoryPtr outgoingConnectionFactory() const;
- ObjectFactoryManagerPtr servantFactoryManager() const;
+ ValueFactoryManagerPtr servantFactoryManager() const;
ObjectAdapterFactoryPtr objectAdapterFactory() const;
ProtocolSupport protocolSupport() const;
bool preferIPv6() const;
@@ -179,7 +179,7 @@ private:
RequestHandlerFactoryPtr _requestHandlerFactory;
ProxyFactoryPtr _proxyFactory;
OutgoingConnectionFactoryPtr _outgoingConnectionFactory;
- ObjectFactoryManagerPtr _servantFactoryManager;
+ ValueFactoryManagerPtr _servantFactoryManager;
ObjectAdapterFactoryPtr _objectAdapterFactory;
ProtocolSupport _protocolSupport;
bool _preferIPv6;
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 6260ba1a674..1312c5d4234 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -51,6 +51,7 @@ SLICE_OBJS = BuiltinSequences.o \
ServantLocator.o \
ServantLocatorF.o \
SliceChecksumDict.o \
+ ValueFactory.o \
Version.o
OBJS = Acceptor.o \
@@ -100,7 +101,6 @@ OBJS = Acceptor.o \
Object.o \
ObjectAdapterFactory.o \
ObjectAdapterI.o \
- ObjectFactoryManager.o \
ObserverHelper.o \
OpaqueEndpointI.o \
Outgoing.o \
@@ -142,6 +142,7 @@ OBJS = Acceptor.o \
UdpEndpointI.o \
UdpTransceiver.o \
Value.o \
+ ValueFactoryManager.o \
WSAcceptor.o \
WSConnector.o \
WSEndpoint.o \
@@ -196,4 +197,4 @@ install:: all
$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
ifeq ($(UNAME),MINGW)
$(call installlib,$(DESTDIR)$(install_libdir),$(BZIP2_HOME)/build/native/bin/$(PLATFORM),bzip2_mingw.dll,,)
-endif \ No newline at end of file
+endif
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index db8cddc15ff..f291fa2674a 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -51,7 +51,7 @@ SLICE_OBJS = .\BuiltinSequences.obj \
.\ServantLocator.obj \
.\ServantLocatorF.obj \
.\SliceChecksumDict.obj \
- .\Value.obj \
+ .\ValueFactory.obj \
.\Version.obj
WINDOWS_OBJS = .\DLLMain.obj
@@ -103,7 +103,6 @@ OBJS = .\Acceptor.obj \
.\Object.obj \
.\ObjectAdapterFactory.obj \
.\ObjectAdapterI.obj \
- .\ObjectFactoryManager.obj \
.\ObserverHelper.obj \
.\OpaqueEndpointI.obj \
.\Outgoing.obj \
@@ -145,6 +144,7 @@ OBJS = .\Acceptor.obj \
.\UdpConnector.obj \
.\UdpEndpointI.obj \
.\UdpTransceiver.obj \
+ .\ValueFactoryManager.obj \
.\WSAcceptor.obj \
.\WSConnector.obj \
.\WSEndpoint.obj \
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp
deleted file mode 100644
index d09ad32afe1..00000000000
--- a/cpp/src/Ice/ObjectFactoryManager.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/ObjectFactoryManager.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/Functional.h>
-#include <Ice/LocalException.h>
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-IceUtil::Shared* IceInternal::upCast(ObjectFactoryManager* p) { return p; }
-
-void
-IceInternal::ObjectFactoryManager::add(const ICE_OBJECT_FACTORY& factory, const string& id)
-{
- IceUtil::Mutex::Lock sync(*this);
-
- if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
- || _factoryMap.find(id) != _factoryMap.end())
- {
- AlreadyRegisteredException ex(__FILE__, __LINE__);
- ex.kindOfObject = "object factory";
- ex.id = id;
- throw ex;
- }
-
- _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_OBJECT_FACTORY>(id, factory));
-}
-
-void
-IceInternal::ObjectFactoryManager::remove(const string& id)
-{
- ICE_OBJECT_FACTORY factory = ICE_NULLPTR;
- {
- IceUtil::Mutex::Lock sync(*this);
-
- FactoryMap::iterator p = _factoryMap.end();
- if(_factoryMapHint != _factoryMap.end())
- {
- if(_factoryMapHint->first == id)
- {
- p = _factoryMapHint;
- }
- }
-
- if(p == _factoryMap.end())
- {
- p = _factoryMap.find(id);
- if(p == _factoryMap.end())
- {
- NotRegisteredException ex(__FILE__, __LINE__);
- ex.kindOfObject = "object factory";
- ex.id = id;
- throw ex;
- }
- }
- assert(p != _factoryMap.end());
-
- factory = p->second;
-
- if(p == _factoryMapHint)
- {
- _factoryMap.erase(p++);
- _factoryMapHint = p;
- }
- else
- {
- _factoryMap.erase(p);
- }
- }
-
- //
- // Destroy outside the lock
- //
- assert(factory != 0);
-#ifndef ICE_CPP11_MAPPING
- factory->destroy();
-#endif
-}
-
-ICE_OBJECT_FACTORY
-IceInternal::ObjectFactoryManager::find(const string& id) const
-{
- IceUtil::Mutex::Lock sync(*this);
-
- FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap);
-
- FactoryMap::iterator p = factoryMap.end();
- if(_factoryMapHint != factoryMap.end())
- {
- if(_factoryMapHint->first == id)
- {
- p = _factoryMapHint;
- }
- }
-
- if(p == factoryMap.end())
- {
- p = factoryMap.find(id);
- }
-
- if(p != factoryMap.end())
- {
- _factoryMapHint = p;
- return p->second;
- }
- else
- {
- return ICE_NULLPTR;
- }
-}
-
-IceInternal::ObjectFactoryManager::ObjectFactoryManager() :
- _factoryMapHint(_factoryMap.end())
-{
-}
-
-void
-IceInternal::ObjectFactoryManager::destroy()
-{
-#ifdef ICE_CPP11_MAPPING
- IceUtil::Mutex::Lock sync(*this);
- _factoryMap.clear();
- _factoryMapHint = _factoryMap.end();
-#else
- FactoryMap oldMap;
- {
- IceUtil::Mutex::Lock sync(*this);
- oldMap.swap(_factoryMap);
- _factoryMapHint = _factoryMap.end();
- }
-
- //
- // Destroy all outside lock
- //
- for_each(oldMap.begin(), oldMap.end(),
- Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
-#endif
-}
diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h
deleted file mode 100644
index c102d276c2c..00000000000
--- a/cpp/src/Ice/ObjectFactoryManager.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_OBJECT_FACTORY_MANAGER_H
-#define ICE_OBJECT_FACTORY_MANAGER_H
-
-#include <IceUtil/Shared.h>
-#include <IceUtil/Mutex.h>
-#include <Ice/ObjectFactoryManagerF.h>
-#include <Ice/ObjectFactory.h>
-
-namespace IceInternal
-{
-
-class ObjectFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
-{
-public:
-
- void add(const ICE_OBJECT_FACTORY&, const std::string&);
- ICE_OBJECT_FACTORY find(const std::string&) const;
- typedef std::map<std::string, ICE_OBJECT_FACTORY> FactoryMap;
-
- void remove(const std::string&);
-
-private:
-
- ObjectFactoryManager();
- void destroy();
- friend class Instance;
-
- FactoryMap _factoryMap;
- mutable FactoryMap::iterator _factoryMapHint;
-};
-
-}
-
-#endif
diff --git a/cpp/src/Ice/ValueFactoryManager.cpp b/cpp/src/Ice/ValueFactoryManager.cpp
new file mode 100644
index 00000000000..6a5b534e14c
--- /dev/null
+++ b/cpp/src/Ice/ValueFactoryManager.cpp
@@ -0,0 +1,175 @@
+
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/ValueFactoryManager.h>
+#include <Ice/ValueFactory.h>
+#include <Ice/ObjectFactory.h>
+#include <Ice/Object.h>
+#include <Ice/Functional.h>
+#include <Ice/LocalException.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+IceUtil::Shared* IceInternal::upCast(ValueFactoryManager* p) { return p; }
+
+#ifndef ICE_CPP11_MAPPING
+IceUtil::Shared* IceInternal::upCast(ValueFactoryWrapper* p) { return p; }
+
+ValueFactoryWrapper::ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) : _objectFactory(factory)
+{
+}
+
+Ice::ValuePtr
+ValueFactoryWrapper::create(const string& id)
+{
+ return _objectFactory->create(id);
+}
+#endif
+
+void
+IceInternal::ValueFactoryManager::add(const ICE_VALUE_FACTORY& factory, const string& id)
+{
+ IceUtil::Mutex::Lock sync(*this);
+
+ if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
+ || _factoryMap.find(id) != _factoryMap.end())
+ {
+ AlreadyRegisteredException ex(__FILE__, __LINE__);
+ ex.kindOfObject = "value factory";
+ ex.id = id;
+ throw ex;
+ }
+
+ _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_VALUE_FACTORY>(id, factory));
+}
+
+void
+IceInternal::ValueFactoryManager::add(const Ice::ObjectFactoryPtr& factory, const string& id)
+{
+ IceUtil::Mutex::Lock sync(*this);
+
+ // Check value factory map since an object factory is added to both object
+ // and value factory maps, but not vise versa
+ if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
+ || _factoryMap.find(id) != _factoryMap.end())
+ {
+ AlreadyRegisteredException ex(__FILE__, __LINE__);
+ ex.kindOfObject = "value factory";
+ ex.id = id;
+ throw ex;
+ }
+
+#ifdef ICE_CPP11_MAPPING
+ _factoryMapHint = _factoryMap.insert(_factoryMapHint,
+ pair<const string, ICE_VALUE_FACTORY>(id,
+ [factory](const string& id)
+ {
+ return factory->create(id);
+ }
+ ));
+#else
+ _factoryMapHint = _factoryMap.insert(_factoryMapHint,
+ pair<const string, ICE_VALUE_FACTORY>(id, new ValueFactoryWrapper(factory)));
+#endif
+
+ _objectFactoryMapHint = _objectFactoryMap.insert(_objectFactoryMapHint,
+ pair<const string, Ice::ObjectFactoryPtr>(id, factory));
+}
+
+ICE_VALUE_FACTORY
+IceInternal::ValueFactoryManager::find(const string& id) const
+{
+ IceUtil::Mutex::Lock sync(*this);
+
+ FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap);
+
+ FactoryMap::iterator p = factoryMap.end();
+ if(_factoryMapHint != factoryMap.end())
+ {
+ if(_factoryMapHint->first == id)
+ {
+ p = _factoryMapHint;
+ }
+ }
+
+ if(p == factoryMap.end())
+ {
+ p = factoryMap.find(id);
+ }
+
+ if(p != factoryMap.end())
+ {
+ _factoryMapHint = p;
+ return p->second;
+ }
+ else
+ {
+ return ICE_NULLPTR;
+ }
+}
+
+Ice::ObjectFactoryPtr
+IceInternal::ValueFactoryManager::findObjectFactory(const string& id) const
+{
+ IceUtil::Mutex::Lock sync(*this);
+
+ ObjectFactoryMap& objectfactoryMap = const_cast<ObjectFactoryMap&>(_objectFactoryMap);
+
+ ObjectFactoryMap::iterator p = objectfactoryMap.end();
+ if(_objectFactoryMapHint != objectfactoryMap.end())
+ {
+ if(_objectFactoryMapHint->first == id)
+ {
+ p = _objectFactoryMapHint;
+ }
+ }
+
+ if(p == objectfactoryMap.end())
+ {
+ p = objectfactoryMap.find(id);
+ }
+
+ if(p != objectfactoryMap.end())
+ {
+ _objectFactoryMapHint = p;
+ return p->second;
+ }
+ else
+ {
+ return ICE_NULLPTR;
+ }
+}
+
+IceInternal::ValueFactoryManager::ValueFactoryManager() :
+ _factoryMapHint(_factoryMap.end()),
+ _objectFactoryMapHint(_objectFactoryMap.end())
+{
+}
+
+void
+IceInternal::ValueFactoryManager::destroy()
+{
+ ObjectFactoryMap oldMap;
+ {
+ IceUtil::Mutex::Lock sync(*this);
+ _factoryMap.clear();
+ _factoryMapHint = _factoryMap.end();
+ oldMap.swap(_objectFactoryMap);
+ _objectFactoryMapHint = _objectFactoryMap.end();
+ }
+
+ //
+ // Destroy all outside lock
+ //
+ for_each(oldMap.begin(), oldMap.end(),
+ Ice::secondVoidMemFun<const string, Ice::ObjectFactory>(&Ice::ObjectFactory::destroy));
+}
diff --git a/cpp/src/Ice/ValueFactoryManager.h b/cpp/src/Ice/ValueFactoryManager.h
new file mode 100644
index 00000000000..31b37c9014e
--- /dev/null
+++ b/cpp/src/Ice/ValueFactoryManager.h
@@ -0,0 +1,61 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_VALUE_FACTORY_MANAGER_H
+#define ICE_VALUE_FACTORY_MANAGER_H
+
+#include <IceUtil/Shared.h>
+#include <IceUtil/Mutex.h>
+#include <Ice/ValueFactoryManagerF.h>
+#include <Ice/ValueFactory.h>
+#include <Ice/ObjectFactory.h>
+
+namespace IceInternal
+{
+
+#ifndef ICE_CPP11_MAPPING
+class ValueFactoryWrapper: public Ice::ValueFactory
+{
+public:
+ ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory);
+
+ Ice::ValuePtr create(const std::string& id);
+
+private:
+ Ice::ObjectFactoryPtr _objectFactory;
+};
+#endif
+
+class ValueFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
+{
+public:
+
+ void add(const ICE_VALUE_FACTORY&, const std::string&);
+ void add(const Ice::ObjectFactoryPtr&, const std::string&);
+ ICE_VALUE_FACTORY find(const std::string&) const;
+ Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const;
+ typedef std::map<std::string, ICE_VALUE_FACTORY> FactoryMap;
+ typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap;
+
+private:
+
+ ValueFactoryManager();
+ void destroy();
+ friend class Instance;
+
+ FactoryMap _factoryMap;
+ mutable FactoryMap::iterator _factoryMapHint;
+
+ ObjectFactoryMap _objectFactoryMap;
+ mutable ObjectFactoryMap::iterator _objectFactoryMapHint;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp
index 92c95a803b1..2c810287d3f 100644
--- a/cpp/src/IceGrid/IceGridDB.cpp
+++ b/cpp/src/IceGrid/IceGridDB.cpp
@@ -66,11 +66,11 @@ private:
string _serverVersion;
};
-class ObjectFactoryI : public Ice::ObjectFactory
+class ValueFactoryI : public Ice::ValueFactory
{
public:
- ObjectFactoryI(const string& serverVersion) :
+ ValueFactoryI(const string& serverVersion) :
_serverVersion(serverVersion)
{
}
@@ -88,10 +88,6 @@ public:
return 0;
}
- virtual void destroy()
- {
- }
-
private:
string _serverVersion;
@@ -282,9 +278,9 @@ Client::run(int argc, char* argv[])
if(!serverVersion.empty())
{
- ObjectFactoryPtr factory = new ObjectFactoryI(serverVersion);
- communicator()->addObjectFactory(factory, "::IceGrid::ServerDescriptor");
- communicator()->addObjectFactory(factory, "::IceGrid::IceBoxDescriptor");
+ ValueFactoryPtr factory = new ValueFactoryI(serverVersion);
+ communicator()->addValueFactory(factory, "::IceGrid::ServerDescriptor");
+ communicator()->addValueFactory(factory, "::IceGrid::IceBoxDescriptor");
}
Ice::InputStreamPtr stream = Ice::wrapInputStream(communicator(), buf, dbContext.encoding);
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 61da931b521..c3d994ff1f5 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -459,7 +459,7 @@ Slice::Gen::generate(const UnitPtr& p)
H << "\n#include <Ice/IncomingAsync.h>";
}
C << "\n#include <Ice/LocalException.h>";
- C << "\n#include <Ice/ObjectFactory.h>";
+ C << "\n#include <Ice/ValueFactory.h>";
C << "\n#include <Ice/Outgoing.h>";
C << "\n#include <Ice/OutgoingAsync.h>";
}
@@ -3275,7 +3275,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
if(!p->isAbstract())
{
- H << sp << nl << "static ::Ice::ObjectFactoryPtr ice_factory();";
+ H << sp << nl << "static ::Ice::ValueFactoryPtr ice_factory();";
}
if(preserved && !basePreserved)
@@ -3412,7 +3412,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
if(!p->isAbstract())
{
string initName = p->flattenedScope() + p->name() + "_init";
- C << sp << nl << "const ::IceInternal::DefaultObjectFactoryInit< " << scoped << "> "
+ C << sp << nl << "const ::IceInternal::DefaultValueFactoryInit< " << scoped << "> "
<< initName << "(\"" << p->scoped() << "\");";
}
if(p->compactId() >= 0)
@@ -3425,9 +3425,9 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
if(!p->isAbstract())
{
- C << sp << nl << "::Ice::ObjectFactoryPtr" << nl << scoped.substr(2) << "::ice_factory()";
+ C << sp << nl << "::Ice::ValueFactoryPtr" << nl << scoped.substr(2) << "::ice_factory()";
C << sb;
- C << nl << "return ::IceInternal::factoryTable->getObjectFactory(" << scoped << "::ice_staticId());";
+ C << nl << "return ::IceInternal::factoryTable->getValueFactory(" << scoped << "::ice_staticId());";
C << eb;
}
}
@@ -8557,7 +8557,7 @@ Slice::Gen::Cpp11ValueVisitor::visitClassDefEnd(const ClassDefPtr& p)
C << nl << "{";
string initName = p->flattenedScope() + p->name() + "_init";
- C << sp << nl << "const ::IceInternal::DefaultObjectFactoryInit< " << scoped << "> "
+ C << sp << nl << "const ::IceInternal::DefaultValueFactoryInit< " << scoped << "> "
<< initName << "(\"" << p->scoped() << "\");";
if(p->compactId() >= 0)
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index e5876b07211..d0397e9cb41 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -3277,20 +3277,17 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
if(!p->isInterface() && p->allOperations().size() == 0 && !p->isLocal())
{
out << sp;
- out << nl << "private static class __F implements Ice.ObjectFactory";
+ out << nl << "private static class __F implements Ice.ValueFactory";
out << sb;
out << nl << "public Ice.Object create(String type)";
out << sb;
out << nl << "assert(type.equals(ice_staticId()));";
out << nl << "return new " << fixKwd(name) << "();";
out << eb;
- out << sp << nl << "public void destroy()";
- out << sb;
- out << eb;
out << eb;
- out << nl << "private static Ice.ObjectFactory _factory = new __F();";
+ out << nl << "private static Ice.ValueFactory _factory = new __F();";
out << sp;
- out << nl << "public static Ice.ObjectFactory" << nl << "ice_factory()";
+ out << nl << "public static Ice.ValueFactory" << nl << "ice_factory()";
out << sb;
out << nl << "return _factory;";
out << eb;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:27:48 +0000