From 2029ff368e49fae489b8ec8fc12f7d126b182dfb Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 1 Dec 2015 17:36:19 +0100 Subject: C++11 mapping initial commit --- cpp/src/Glacier2/.depend.mak | 93 +- .../Glacier2CryptPermissionsVerifier/.depend.mak | 7 +- cpp/src/Glacier2Lib/.depend.mak | 57 +- cpp/src/Ice/.depend.mak | 672 ++- cpp/src/Ice/ACM.cpp | 12 +- cpp/src/Ice/ACM.h | 6 +- cpp/src/Ice/Application.cpp | 12 +- cpp/src/Ice/AsyncResult.cpp | 55 +- cpp/src/Ice/BasicStream.cpp | 73 +- cpp/src/Ice/BatchRequestQueue.cpp | 12 +- cpp/src/Ice/BatchRequestQueue.h | 2 +- cpp/src/Ice/CollocatedRequestHandler.cpp | 53 +- cpp/src/Ice/CollocatedRequestHandler.h | 12 +- cpp/src/Ice/CommunicatorI.cpp | 185 +- cpp/src/Ice/CommunicatorI.h | 49 +- cpp/src/Ice/ConnectRequestHandler.cpp | 33 +- cpp/src/Ice/ConnectRequestHandler.h | 12 +- cpp/src/Ice/ConnectRequestHandlerF.h | 4 + cpp/src/Ice/ConnectionFactory.cpp | 114 +- cpp/src/Ice/ConnectionFactory.h | 24 +- cpp/src/Ice/ConnectionI.cpp | 274 +- cpp/src/Ice/ConnectionI.h | 43 +- cpp/src/Ice/ConnectionRequestHandler.cpp | 2 +- cpp/src/Ice/ConnectionRequestHandler.h | 3 +- cpp/src/Ice/DynamicLibrary.cpp | 4 +- cpp/src/Ice/EndpointFactoryManager.cpp | 4 +- cpp/src/Ice/EndpointI.cpp | 2 + cpp/src/Ice/EndpointI.h | 15 +- cpp/src/Ice/EndpointIF.h | 21 +- cpp/src/Ice/EventHandler.cpp | 2 + cpp/src/Ice/EventHandler.h | 8 +- cpp/src/Ice/EventHandlerF.h | 5 +- cpp/src/Ice/Exception.cpp | 2 +- cpp/src/Ice/FactoryTable.cpp | 35 +- cpp/src/Ice/GCObject.cpp | 3 + cpp/src/Ice/IPEndpointI.cpp | 40 +- cpp/src/Ice/IPEndpointI.h | 7 + cpp/src/Ice/IPEndpointIF.h | 6 +- cpp/src/Ice/ImplicitContextI.cpp | 50 +- cpp/src/Ice/ImplicitContextI.h | 8 +- cpp/src/Ice/Incoming.cpp | 18 +- cpp/src/Ice/IncomingAsync.cpp | 8 + cpp/src/Ice/Initialize.cpp | 70 +- cpp/src/Ice/Instance.cpp | 48 +- cpp/src/Ice/Instance.h | 10 +- cpp/src/Ice/InstrumentationI.cpp | 116 +- cpp/src/Ice/InstrumentationI.h | 57 +- cpp/src/Ice/LocatorInfo.cpp | 80 +- cpp/src/Ice/LocatorInfo.h | 24 +- cpp/src/Ice/LoggerAdminI.cpp | 215 +- cpp/src/Ice/LoggerAdminI.h | 6 +- cpp/src/Ice/LoggerI.cpp | 2 +- cpp/src/Ice/LoggerI.h | 3 +- cpp/src/Ice/Makefile | 2 +- cpp/src/Ice/Makefile.mak | 2 +- cpp/src/Ice/MetricsAdminI.cpp | 10 +- cpp/src/Ice/Object.cpp | 77 +- cpp/src/Ice/ObjectAdapterFactory.cpp | 38 +- cpp/src/Ice/ObjectAdapterFactory.h | 11 +- cpp/src/Ice/ObjectAdapterI.cpp | 117 +- cpp/src/Ice/ObjectAdapterI.h | 43 +- cpp/src/Ice/ObjectFactoryManager.cpp | 18 +- cpp/src/Ice/ObjectFactoryManager.h | 10 +- cpp/src/Ice/ObserverHelper.cpp | 4 +- cpp/src/Ice/OpaqueEndpointI.cpp | 30 +- cpp/src/Ice/OpaqueEndpointI.h | 6 +- cpp/src/Ice/Outgoing.cpp | 11 +- cpp/src/Ice/OutgoingAsync.cpp | 397 +- cpp/src/Ice/PluginManagerI.cpp | 3 +- cpp/src/Ice/PluginManagerI.h | 2 +- cpp/src/Ice/PropertiesAdminI.cpp | 13 +- cpp/src/Ice/PropertiesAdminI.h | 8 +- cpp/src/Ice/PropertiesI.cpp | 2 +- cpp/src/Ice/PropertiesI.h | 8 +- cpp/src/Ice/Protocol.cpp | 2 +- cpp/src/Ice/Proxy.cpp | 1205 ++++-- cpp/src/Ice/ProxyFactory.cpp | 18 +- cpp/src/Ice/ProxyFactory.h | 14 +- cpp/src/Ice/Reference.cpp | 30 +- cpp/src/Ice/Reference.h | 25 +- cpp/src/Ice/ReferenceFactory.cpp | 12 +- cpp/src/Ice/ReferenceFactory.h | 12 +- cpp/src/Ice/RequestHandler.cpp | 2 + cpp/src/Ice/RequestHandler.h | 8 +- cpp/src/Ice/RequestHandlerFactory.cpp | 12 +- cpp/src/Ice/RequestHandlerFactory.h | 2 +- cpp/src/Ice/ResponseHandler.cpp | 7 +- cpp/src/Ice/ResponseHandler.h | 10 +- cpp/src/Ice/RetryQueue.cpp | 6 +- cpp/src/Ice/RetryQueue.h | 6 +- cpp/src/Ice/RouterInfo.cpp | 115 +- cpp/src/Ice/RouterInfo.h | 50 +- cpp/src/Ice/Selector.cpp | 22 +- cpp/src/Ice/Service.cpp | 12 +- cpp/src/Ice/SlicedData.cpp | 7 + cpp/src/Ice/StreamI.cpp | 10 +- cpp/src/Ice/StreamI.h | 6 +- cpp/src/Ice/SysLoggerI.cpp | 2 +- cpp/src/Ice/SysLoggerI.h | 3 +- cpp/src/Ice/TcpEndpointI.cpp | 47 +- cpp/src/Ice/TcpEndpointI.h | 6 +- cpp/src/Ice/TcpTransceiver.cpp | 4 +- cpp/src/Ice/ThreadPool.cpp | 28 +- cpp/src/Ice/ThreadPool.h | 2 +- cpp/src/Ice/TraceUtil.cpp | 8 +- cpp/src/Ice/UdpEndpointI.cpp | 44 +- cpp/src/Ice/UdpEndpointI.h | 7 +- cpp/src/Ice/UdpTransceiver.cpp | 2 +- cpp/src/Ice/Value.cpp | 69 + cpp/src/Ice/VirtualShared.h | 31 + cpp/src/Ice/WSEndpoint.cpp | 66 +- cpp/src/Ice/WSEndpoint.h | 5 + cpp/src/IceBox/.depend.mak | 33 +- cpp/src/IceDB/.depend.mak | 4 +- cpp/src/IceDiscovery/.depend.mak | 29 +- cpp/src/IceDiscovery/LocatorI.cpp | 24 +- cpp/src/IceDiscovery/LocatorI.h | 24 +- cpp/src/IceDiscovery/LookupI.cpp | 24 +- cpp/src/IceDiscovery/LookupI.h | 32 +- cpp/src/IceGrid/.depend.mak | 398 +- cpp/src/IceGridLib/.depend.mak | 77 +- cpp/src/IceLocatorDiscovery/.depend.mak | 17 +- cpp/src/IcePatch2/.depend.mak | 28 +- cpp/src/IcePatch2Lib/.depend.mak | 24 +- cpp/src/IceSSL/.depend.mak | 103 +- cpp/src/IceSSL/Certificate.cpp | 25 +- cpp/src/IceSSL/EndpointI.cpp | 48 +- cpp/src/IceSSL/EndpointI.h | 6 + cpp/src/IceSSL/InstanceF.h | 4 + cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 10 +- cpp/src/IceSSL/SChannelTransceiverI.cpp | 8 +- cpp/src/IceSSL/SecureTransportTransceiverI.cpp | 8 +- cpp/src/IceStorm/.depend.mak | 156 +- cpp/src/IceStormLib/.depend.mak | 12 +- cpp/src/Makefile | 9 + cpp/src/Makefile.mak | 7 +- cpp/src/Slice/CPlusPlusUtil.cpp | 272 +- cpp/src/Slice/CsUtil.cpp | 20 +- cpp/src/Slice/Grammar.cpp | 4354 +++++++++----------- cpp/src/Slice/Grammar.h | 125 +- cpp/src/Slice/Grammar.y | 447 +- cpp/src/Slice/JavaUtil.cpp | 12 + cpp/src/Slice/ObjCUtil.cpp | 1 + cpp/src/Slice/Parser.cpp | 226 +- cpp/src/Slice/PythonUtil.cpp | 3 + cpp/src/Slice/RubyUtil.cpp | 3 + cpp/src/Slice/Scanner.cpp | 535 +-- cpp/src/Slice/Scanner.l | 440 +- cpp/src/iceserviceinstall/.depend.mak | 14 +- cpp/src/slice2cpp/Gen.cpp | 3578 +++++++++++++++- cpp/src/slice2cpp/Gen.h | 251 +- cpp/src/slice2cs/Gen.cpp | 1 + cpp/src/slice2java/Gen.cpp | 5 + cpp/src/slice2js/JsUtil.cpp | 3 + cpp/src/slice2php/Main.cpp | 4 + 155 files changed, 11582 insertions(+), 5229 deletions(-) create mode 100644 cpp/src/Ice/Value.cpp create mode 100644 cpp/src/Ice/VirtualShared.h mode change 100755 => 100644 cpp/src/IceDB/.depend.mak (limited to 'cpp/src') diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak index d4a270c603d..c404b93e827 100755 --- a/cpp/src/Glacier2/.depend.mak +++ b/cpp/src/Glacier2/.depend.mak @@ -26,6 +26,7 @@ Blobject.obj: \ "$(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" \ @@ -34,6 +35,7 @@ Blobject.obj: \ "$(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" \ @@ -74,7 +76,7 @@ Blobject.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -88,6 +90,7 @@ Blobject.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -99,7 +102,6 @@ Blobject.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -122,7 +124,6 @@ Blobject.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -161,6 +162,7 @@ ClientBlobject.obj: \ "$(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" \ @@ -169,6 +171,7 @@ ClientBlobject.obj: \ "$(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" \ @@ -209,7 +212,7 @@ ClientBlobject.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -223,6 +226,7 @@ ClientBlobject.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -234,7 +238,6 @@ ClientBlobject.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -257,7 +260,6 @@ ClientBlobject.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -295,6 +297,7 @@ FilterI.obj: \ "$(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" \ @@ -303,6 +306,7 @@ FilterI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -337,7 +341,7 @@ FilterI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -346,6 +350,7 @@ FilterI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -365,7 +370,6 @@ FilterI.obj: \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -383,6 +387,7 @@ FilterManager.obj: \ "$(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" \ @@ -391,6 +396,7 @@ FilterManager.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -425,7 +431,7 @@ FilterManager.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -434,6 +440,7 @@ FilterManager.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -473,7 +480,6 @@ FilterManager.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ "$(includedir)\Ice\Endpoint.h" \ @@ -489,7 +495,6 @@ FilterManager.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -534,6 +539,7 @@ Glacier2Router.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -542,6 +548,7 @@ Glacier2Router.obj: \ "$(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" \ @@ -578,7 +585,7 @@ Glacier2Router.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -592,6 +599,7 @@ Glacier2Router.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -603,7 +611,6 @@ Glacier2Router.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -626,7 +633,6 @@ Glacier2Router.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -676,6 +682,7 @@ Instance.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -684,6 +691,7 @@ Instance.obj: \ "$(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" \ @@ -716,7 +724,7 @@ Instance.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -730,6 +738,7 @@ Instance.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -741,7 +750,6 @@ Instance.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -764,7 +772,6 @@ Instance.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -809,6 +816,7 @@ InstrumentationI.obj: \ "$(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" \ @@ -817,6 +825,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -852,7 +861,7 @@ InstrumentationI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -862,13 +871,13 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -915,6 +924,7 @@ ProxyVerifier.obj: \ "$(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" \ @@ -923,6 +933,7 @@ ProxyVerifier.obj: \ "$(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" \ @@ -963,7 +974,7 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -977,6 +988,7 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -988,7 +1000,6 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1011,7 +1022,6 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1046,6 +1056,7 @@ RequestQueue.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -1054,6 +1065,7 @@ RequestQueue.obj: \ "$(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" \ @@ -1086,7 +1098,7 @@ RequestQueue.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1100,6 +1112,7 @@ RequestQueue.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1111,7 +1124,6 @@ RequestQueue.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1134,7 +1146,6 @@ RequestQueue.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1171,6 +1182,7 @@ RouterI.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -1179,6 +1191,7 @@ RouterI.obj: \ "$(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" \ @@ -1213,7 +1226,7 @@ RouterI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1236,6 +1249,7 @@ RouterI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1247,7 +1261,6 @@ RouterI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1270,7 +1283,6 @@ RouterI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1312,6 +1324,7 @@ RoutingTable.obj: \ "$(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" \ @@ -1320,6 +1333,7 @@ RoutingTable.obj: \ "$(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" \ @@ -1360,7 +1374,7 @@ RoutingTable.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1374,6 +1388,7 @@ RoutingTable.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1385,7 +1400,6 @@ RoutingTable.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1408,7 +1422,6 @@ RoutingTable.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1438,6 +1451,7 @@ ServerBlobject.obj: \ "$(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" \ @@ -1446,6 +1460,7 @@ ServerBlobject.obj: \ "$(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" \ @@ -1486,7 +1501,7 @@ ServerBlobject.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1500,6 +1515,7 @@ ServerBlobject.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1511,7 +1527,6 @@ ServerBlobject.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1534,7 +1549,6 @@ ServerBlobject.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1580,6 +1594,7 @@ SessionRouterI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -1588,6 +1603,7 @@ SessionRouterI.obj: \ "$(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" \ @@ -1620,7 +1636,7 @@ SessionRouterI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1634,6 +1650,7 @@ SessionRouterI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1645,7 +1662,6 @@ SessionRouterI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1668,7 +1684,6 @@ SessionRouterI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1714,6 +1729,7 @@ Instrumentation.obj: \ "$(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" \ @@ -1722,6 +1738,7 @@ Instrumentation.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\EndpointF.h" \ @@ -1742,7 +1759,7 @@ Instrumentation.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak index e2a6aa1d08e..47e047f82d4 100755 --- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak @@ -13,6 +13,7 @@ CryptPermissionsVerifierI.obj: \ "$(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" \ @@ -21,6 +22,7 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -55,7 +57,7 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -64,13 +66,13 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -118,7 +120,6 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak index 76443d62b0c..2617d2afe55 100755 --- a/cpp/src/Glacier2Lib/.depend.mak +++ b/cpp/src/Glacier2Lib/.depend.mak @@ -52,6 +52,7 @@ Application.obj: \ "$(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" \ @@ -60,6 +61,7 @@ Application.obj: \ "$(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" \ @@ -100,7 +102,7 @@ Application.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -114,6 +116,7 @@ Application.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -125,7 +128,6 @@ Application.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -147,7 +149,6 @@ Application.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -181,6 +182,7 @@ NullPermissionsVerifier.obj: \ "$(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" \ @@ -189,6 +191,7 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -223,7 +226,7 @@ NullPermissionsVerifier.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -232,13 +235,13 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -283,7 +286,6 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -318,6 +320,7 @@ SessionHelper.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -326,6 +329,7 @@ SessionHelper.obj: \ "$(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" \ @@ -353,7 +357,7 @@ SessionHelper.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -369,6 +373,7 @@ SessionHelper.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -391,7 +396,6 @@ SessionHelper.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ServantLocator.h" \ "$(includedir)\Ice\SlicedData.h" \ @@ -406,7 +410,6 @@ SessionHelper.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -440,6 +443,7 @@ Metrics.obj: \ "$(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" \ @@ -448,6 +452,7 @@ Metrics.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -482,7 +487,7 @@ Metrics.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -491,13 +496,13 @@ Metrics.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -522,6 +527,7 @@ PermissionsVerifierF.obj: \ "$(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" \ @@ -530,6 +536,7 @@ PermissionsVerifierF.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -564,7 +571,7 @@ PermissionsVerifierF.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -586,6 +593,7 @@ PermissionsVerifier.obj: \ "$(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" \ @@ -594,6 +602,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -628,7 +637,7 @@ PermissionsVerifier.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -637,13 +646,13 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -669,6 +678,7 @@ Router.obj: \ "$(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" \ @@ -677,6 +687,7 @@ Router.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -711,7 +722,7 @@ Router.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -720,6 +731,7 @@ Router.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -727,7 +739,6 @@ Router.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -756,6 +767,7 @@ RouterF.obj: \ "$(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" \ @@ -764,6 +776,7 @@ RouterF.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -798,7 +811,7 @@ RouterF.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -820,6 +833,7 @@ Session.obj: \ "$(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" \ @@ -828,6 +842,7 @@ Session.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -862,7 +877,7 @@ Session.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -871,13 +886,13 @@ Session.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -903,6 +918,7 @@ SSLInfo.obj: \ "$(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" \ @@ -911,6 +927,7 @@ SSLInfo.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -931,7 +948,7 @@ SSLInfo.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index 00b45064bf5..f858d5d4a32 100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -7,7 +7,7 @@ Communicator.h: \ "$(slicedir)/Ice/LoggerF.ice" \ "$(slicedir)/Ice/InstrumentationF.ice" \ "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ObjectFactoryF.ice" \ + "$(slicedir)/Ice/ObjectFactory.ice" \ "$(slicedir)/Ice/RouterF.ice" \ "$(slicedir)/Ice/LocatorF.ice" \ "$(slicedir)/Ice/PluginF.ice" \ @@ -95,7 +95,7 @@ LocalException.h: \ Locator.h: \ "$(slicedir)\Ice\Locator.ice" \ "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/ProcessF.ice" + "$(slicedir)/Ice/Process.ice" LocatorF.h: \ "$(slicedir)\Ice\LocatorF.ice" @@ -128,9 +128,6 @@ ObjectAdapterF.h: \ ObjectFactory.h: \ "$(slicedir)\Ice\ObjectFactory.ice" -ObjectFactoryF.h: \ - "$(slicedir)\Ice\ObjectFactoryF.ice" - Plugin.h: \ "$(slicedir)\Ice\Plugin.ice" \ "$(slicedir)/Ice/LoggerF.ice" \ @@ -206,6 +203,7 @@ Acceptor.obj: \ "$(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" \ @@ -214,6 +212,7 @@ Acceptor.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -248,7 +247,7 @@ Acceptor.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -283,6 +282,7 @@ ACM.obj: \ "$(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" \ @@ -291,6 +291,7 @@ ACM.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -318,7 +319,7 @@ ACM.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -354,6 +355,7 @@ ACM.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -398,6 +400,7 @@ Application.obj: \ "$(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" \ @@ -406,6 +409,7 @@ Application.obj: \ "$(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" \ @@ -446,7 +450,7 @@ Application.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -460,6 +464,7 @@ Application.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -471,7 +476,6 @@ Application.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -493,7 +497,6 @@ Application.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -533,12 +536,14 @@ AsyncResult.obj: \ "$(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\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" \ @@ -557,7 +562,7 @@ AsyncResult.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -615,6 +620,7 @@ AsyncResult.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -659,6 +665,7 @@ BasicStream.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -667,6 +674,7 @@ BasicStream.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -674,7 +682,7 @@ BasicStream.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -738,6 +746,7 @@ BasicStream.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -747,7 +756,6 @@ BasicStream.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "ObjectFactoryManager.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ @@ -787,6 +795,7 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -795,6 +804,7 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -802,7 +812,7 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -858,6 +868,7 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -881,6 +892,7 @@ Buffer.obj: \ "$(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" \ @@ -889,6 +901,7 @@ Buffer.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -928,12 +941,14 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -949,7 +964,7 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1007,6 +1022,7 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ @@ -1055,6 +1071,7 @@ CommunicatorI.obj: \ "$(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" \ @@ -1063,6 +1080,7 @@ CommunicatorI.obj: \ "$(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" \ @@ -1090,7 +1108,7 @@ CommunicatorI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1106,6 +1124,7 @@ CommunicatorI.obj: \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1157,6 +1176,7 @@ CommunicatorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "AcceptorF.h" \ "EndpointI.h" \ + "$(includedir)\Ice\Comparable.h" \ "ReferenceFactory.h" \ "Reference.h" \ "BatchRequestQueue.h" \ @@ -1196,6 +1216,7 @@ ConnectionFactory.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -1204,6 +1225,7 @@ ConnectionFactory.obj: \ "$(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" \ @@ -1236,7 +1258,7 @@ ConnectionFactory.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1272,6 +1294,7 @@ ConnectionFactory.obj: \ "RouterInfoF.h" \ "EndpointI.h" \ "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\Comparable.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "DefaultsAndOverridesF.h" \ @@ -1292,6 +1315,7 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -1315,6 +1339,7 @@ ConnectionFactory.obj: \ "BatchRequestQueue.h" \ "SharedContext.h" \ "RouterInfo.h" \ + "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ @@ -1347,6 +1372,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -1355,6 +1381,7 @@ ConnectionI.obj: \ "$(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" \ @@ -1381,7 +1408,7 @@ ConnectionI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1436,6 +1463,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -1494,12 +1522,14 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.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" \ @@ -1522,7 +1552,7 @@ ConnectionRequestHandler.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1542,6 +1572,7 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1575,6 +1606,8 @@ ConnectionRequestHandler.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "RouterInfo.h" \ + "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ @@ -1626,12 +1659,14 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\EndpointF.h" \ @@ -1654,7 +1689,7 @@ ConnectRequestHandler.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1670,6 +1705,7 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1678,6 +1714,8 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "RouterInfo.h" \ + "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\Comparable.h" \ "ConnectionRequestHandler.h" \ "RequestHandlerFactory.h" \ "Instance.h" \ @@ -1743,6 +1781,7 @@ DefaultsAndOverrides.obj: \ "$(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" \ @@ -1751,6 +1790,7 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1785,7 +1825,7 @@ DefaultsAndOverrides.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1802,6 +1842,7 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1829,6 +1870,7 @@ DeprecatedStringConverter.obj: \ "$(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" \ @@ -1837,6 +1879,7 @@ DeprecatedStringConverter.obj: \ "$(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" \ @@ -1877,7 +1920,7 @@ DeprecatedStringConverter.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1915,6 +1958,7 @@ DeprecatedStringConverter.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1942,6 +1986,7 @@ DispatchInterceptor.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -1950,6 +1995,7 @@ DispatchInterceptor.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -1965,7 +2011,7 @@ DispatchInterceptor.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2011,6 +2057,7 @@ EndpointFactory.obj: \ "$(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" \ @@ -2019,6 +2066,7 @@ EndpointFactory.obj: \ "$(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" \ @@ -2070,7 +2118,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2097,6 +2145,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2127,6 +2176,7 @@ EndpointFactoryManager.obj: \ "$(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" \ @@ -2135,6 +2185,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -2160,7 +2211,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2213,6 +2264,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2240,6 +2292,7 @@ EndpointI.obj: \ "$(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" \ @@ -2248,6 +2301,7 @@ EndpointI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -2286,6 +2340,7 @@ EventHandler.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -2294,6 +2349,7 @@ EventHandler.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -2301,7 +2357,7 @@ EventHandler.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2363,6 +2419,7 @@ EventHandler.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2380,6 +2437,7 @@ Exception.obj: \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Atomic.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -2390,6 +2448,7 @@ Exception.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -2429,7 +2488,7 @@ Exception.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2442,6 +2501,7 @@ Exception.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\IceUtil\StringUtil.h" \ @@ -2460,12 +2520,13 @@ FactoryTable.obj: \ "$(includedir)\IceUtil\Atomic.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2474,10 +2535,10 @@ FactoryTable.obj: \ "$(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" \ FactoryTableInit.obj: \ FactoryTableInit.cpp \ @@ -2495,12 +2556,13 @@ FactoryTableInit.obj: \ "$(includedir)\IceUtil\Atomic.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2509,11 +2571,11 @@ FactoryTableInit.obj: \ "$(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\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ GCObject.obj: \ @@ -2538,6 +2600,7 @@ GCObject.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -2546,6 +2609,7 @@ GCObject.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -2580,6 +2644,7 @@ HttpParser.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -2588,6 +2653,7 @@ HttpParser.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -2595,7 +2661,7 @@ HttpParser.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2621,6 +2687,7 @@ ImplicitContextI.obj: \ "$(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" \ @@ -2629,6 +2696,7 @@ ImplicitContextI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Identity.h" \ @@ -2649,7 +2717,7 @@ ImplicitContextI.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2677,12 +2745,14 @@ Incoming.obj: \ "$(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\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" \ @@ -2701,7 +2771,7 @@ Incoming.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2781,6 +2851,7 @@ Incoming.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -2809,12 +2880,14 @@ IncomingAsync.obj: \ "$(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\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" \ @@ -2832,7 +2905,7 @@ IncomingAsync.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2907,6 +2980,7 @@ IncomingAsync.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "ReplyStatus.h" \ @@ -2939,6 +3013,7 @@ Initialize.obj: \ "$(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" \ @@ -2947,6 +3022,7 @@ Initialize.obj: \ "$(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" \ @@ -2974,7 +3050,7 @@ Initialize.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2990,6 +3066,7 @@ Initialize.obj: \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3060,6 +3137,7 @@ Instance.obj: \ "$(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" \ @@ -3068,6 +3146,7 @@ Instance.obj: \ "$(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" \ @@ -3103,7 +3182,7 @@ Instance.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3133,6 +3212,7 @@ Instance.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3142,19 +3222,18 @@ Instance.obj: \ "Network.h" \ "ProtocolInstanceF.h" \ "RouterInfo.h" \ - "$(includedir)\Ice\RouterF.h" \ - "EndpointIF.h" \ "$(includedir)\Ice\Router.h" \ + "EndpointIF.h" \ + "$(includedir)\Ice\Comparable.h" \ "LocatorInfo.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ "ReferenceFactory.h" \ "Reference.h" \ + "$(includedir)\Ice\RouterF.h" \ "BatchRequestQueue.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ @@ -3228,6 +3307,7 @@ InstrumentationI.obj: \ "$(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" \ @@ -3236,6 +3316,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -3271,7 +3352,7 @@ InstrumentationI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3281,13 +3362,13 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -3340,6 +3421,7 @@ IPEndpointI.obj: \ "$(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" \ @@ -3348,6 +3430,7 @@ IPEndpointI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -3383,7 +3466,7 @@ IPEndpointI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3423,6 +3506,7 @@ IPEndpointI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3472,6 +3556,7 @@ LocatorInfo.obj: \ "$(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" \ @@ -3480,6 +3565,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -3507,7 +3593,7 @@ LocatorInfo.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3519,6 +3605,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3526,8 +3613,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "Instance.h" \ @@ -3561,7 +3647,6 @@ LocatorInfo.obj: \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\Process.h" \ "TraceLevels.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Logger.h" \ @@ -3593,6 +3678,7 @@ LoggerAdminI.obj: \ "$(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" \ @@ -3601,6 +3687,7 @@ LoggerAdminI.obj: \ "$(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" \ @@ -3636,7 +3723,7 @@ LoggerAdminI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3655,6 +3742,7 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3670,7 +3758,6 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\Connection.h" \ @@ -3693,6 +3780,7 @@ LoggerI.obj: \ "$(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" \ @@ -3701,6 +3789,7 @@ LoggerI.obj: \ "$(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" \ @@ -3732,6 +3821,7 @@ LoggerUtil.obj: \ "$(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" \ @@ -3740,6 +3830,7 @@ LoggerUtil.obj: \ "$(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" \ @@ -3793,7 +3884,7 @@ LoggerUtil.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3819,6 +3910,7 @@ LoggerUtil.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3839,6 +3931,7 @@ MetricsAdminI.obj: \ "$(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" \ @@ -3847,6 +3940,7 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -3881,7 +3975,7 @@ MetricsAdminI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3890,6 +3984,7 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3910,7 +4005,6 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "InstrumentationI.h" \ "$(includedir)\Ice\MetricsObserverI.h" \ "..\..\src\IceUtil\StopWatch.h" \ @@ -3966,6 +4060,7 @@ MetricsObserverI.obj: \ "$(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" \ @@ -3974,6 +4069,7 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -4009,7 +4105,7 @@ MetricsObserverI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4019,13 +4115,13 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -4060,6 +4156,7 @@ Network.obj: \ "$(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" \ @@ -4068,6 +4165,7 @@ Network.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -4102,7 +4200,7 @@ Network.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4150,6 +4248,7 @@ Network.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4179,6 +4278,7 @@ NetworkProxy.obj: \ "$(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" \ @@ -4187,6 +4287,7 @@ NetworkProxy.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -4221,7 +4322,7 @@ NetworkProxy.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4236,6 +4337,7 @@ NetworkProxy.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4264,6 +4366,7 @@ Object.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -4272,6 +4375,7 @@ Object.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -4286,7 +4390,7 @@ Object.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4317,6 +4421,7 @@ Object.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ ObjectAdapterFactory.obj: \ ObjectAdapterFactory.cpp \ @@ -4341,6 +4446,7 @@ ObjectAdapterFactory.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -4349,6 +4455,7 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -4377,7 +4484,7 @@ ObjectAdapterFactory.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4432,6 +4539,7 @@ ObjectAdapterI.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -4440,6 +4548,7 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -4468,7 +4577,7 @@ ObjectAdapterI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4518,6 +4627,7 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "ProxyFactory.h" \ @@ -4545,16 +4655,16 @@ ObjectAdapterI.obj: \ "RequestHandler.h" \ "ResponseHandler.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ + "$(includedir)\Ice\Comparable.h" \ "ServantManager.h" \ "RouterInfo.h" \ + "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ "LocatorInfo.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Logger.h" \ "ThreadPool.h" \ @@ -4562,7 +4672,6 @@ ObjectAdapterI.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\Router.h" \ "DefaultsAndOverrides.h" \ "TraceLevels.h" \ "PropertyNames.h" \ @@ -4583,11 +4692,12 @@ ObjectFactoryManager.obj: \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ObjectFactoryF.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" \ @@ -4596,10 +4706,10 @@ ObjectFactoryManager.obj: \ "$(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\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -4622,6 +4732,7 @@ ObserverHelper.obj: \ "$(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" \ @@ -4630,6 +4741,7 @@ ObserverHelper.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -4666,7 +4778,7 @@ ObserverHelper.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4682,6 +4794,7 @@ ObserverHelper.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4738,6 +4851,7 @@ OpaqueEndpointI.obj: \ "$(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" \ @@ -4746,6 +4860,7 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -4776,7 +4891,7 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4839,12 +4954,14 @@ Outgoing.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -4852,7 +4969,7 @@ Outgoing.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4913,6 +5030,7 @@ Outgoing.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -4964,12 +5082,14 @@ OutgoingAsync.obj: \ "$(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\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" \ @@ -4988,7 +5108,7 @@ OutgoingAsync.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5042,6 +5162,7 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -5089,6 +5210,7 @@ PluginManagerI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -5097,6 +5219,7 @@ PluginManagerI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -5132,7 +5255,7 @@ PluginManagerI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5141,6 +5264,7 @@ PluginManagerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5205,6 +5329,7 @@ PropertiesAdminI.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -5213,6 +5338,7 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -5243,7 +5369,7 @@ PropertiesAdminI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5252,6 +5378,7 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5285,6 +5412,7 @@ PropertiesI.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -5293,6 +5421,7 @@ PropertiesI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -5322,7 +5451,7 @@ PropertiesI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5331,6 +5460,7 @@ PropertiesI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5381,6 +5511,7 @@ Protocol.obj: \ "$(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" \ @@ -5389,6 +5520,7 @@ Protocol.obj: \ "$(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" \ @@ -5412,6 +5544,7 @@ ProtocolInstance.obj: \ "$(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" \ @@ -5420,6 +5553,7 @@ ProtocolInstance.obj: \ "$(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" \ @@ -5454,7 +5588,7 @@ ProtocolInstance.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5500,6 +5634,7 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5528,6 +5663,7 @@ ProtocolPluginFacade.obj: \ "$(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" \ @@ -5536,6 +5672,7 @@ ProtocolPluginFacade.obj: \ "$(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" \ @@ -5587,7 +5724,7 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5616,6 +5753,7 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5651,12 +5789,14 @@ Proxy.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.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" \ @@ -5681,7 +5821,7 @@ Proxy.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5693,6 +5833,7 @@ Proxy.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5752,6 +5893,8 @@ Proxy.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Process.h" \ "RouterInfo.h" \ + "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\Comparable.h" \ "LocatorInfo.h" \ "ConnectionI.h" \ "..\..\src\IceUtil\StopWatch.h" \ @@ -5788,6 +5931,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Properties.h" \ @@ -5797,6 +5941,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\RequestHandlerF.h" \ @@ -5823,7 +5968,7 @@ ProxyFactory.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5832,6 +5977,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5882,6 +6028,8 @@ ProxyFactory.obj: \ "SharedContext.h" \ "LocatorInfo.h" \ "RouterInfo.h" \ + "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Logger.h" \ "TraceLevels.h" \ @@ -5906,6 +6054,7 @@ Reference.obj: \ "$(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" \ @@ -5914,6 +6063,7 @@ Reference.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -5946,7 +6096,7 @@ Reference.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5962,6 +6112,7 @@ Reference.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6011,12 +6162,11 @@ Reference.obj: \ "ProtocolInstanceF.h" \ "RouterInfo.h" \ "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\Comparable.h" \ "LocatorInfo.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ "ConnectionI.h" \ @@ -6054,6 +6204,7 @@ ReferenceFactory.obj: \ "$(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" \ @@ -6062,6 +6213,7 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -6096,7 +6248,7 @@ ReferenceFactory.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6105,6 +6257,7 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6175,12 +6328,11 @@ ReferenceFactory.obj: \ "EndpointFactoryF.h" \ "RouterInfo.h" \ "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\Comparable.h" \ "LocatorInfo.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Logger.h" \ "DefaultsAndOverrides.h" \ @@ -6202,6 +6354,7 @@ RegisterPluginsInit.obj: \ "$(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" \ @@ -6210,6 +6363,7 @@ RegisterPluginsInit.obj: \ "$(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" \ @@ -6247,7 +6401,7 @@ RegisterPluginsInit.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6287,12 +6441,14 @@ RequestHandler.obj: \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -6322,7 +6478,7 @@ RequestHandler.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6338,6 +6494,7 @@ RequestHandler.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6380,12 +6537,14 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -6400,7 +6559,7 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6433,12 +6592,15 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "RouterInfo.h" \ + "$(includedir)\Ice\Router.h" \ + "$(includedir)\Ice\Comparable.h" \ "ObjectAdapterFactory.h" \ "ObjectAdapterI.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -6486,6 +6648,7 @@ ResponseHandler.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -6494,6 +6657,7 @@ ResponseHandler.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -6538,12 +6702,14 @@ RetryQueue.obj: \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.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" \ @@ -6560,7 +6726,7 @@ RetryQueue.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6606,6 +6772,7 @@ RetryQueue.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6630,11 +6797,12 @@ RouterInfo.obj: \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\RouterF.h" \ + "$(includedir)\Ice\Router.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" \ @@ -6643,6 +6811,7 @@ RouterInfo.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -6672,22 +6841,23 @@ RouterInfo.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "EndpointIF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "EndpointIF.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ @@ -6695,6 +6865,7 @@ RouterInfo.obj: \ "$(includedir)\IceUtil\Functional.h" \ "Reference.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ @@ -6730,6 +6901,7 @@ Selector.obj: \ "$(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" \ @@ -6738,6 +6910,7 @@ Selector.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -6765,7 +6938,7 @@ Selector.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6810,6 +6983,7 @@ Selector.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6839,6 +7013,7 @@ ServantManager.obj: \ "$(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" \ @@ -6847,6 +7022,7 @@ ServantManager.obj: \ "$(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" \ @@ -6898,7 +7074,7 @@ ServantManager.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6923,6 +7099,7 @@ ServantManager.obj: \ "$(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)\IceUtil\StringUtil.h" \ @@ -6957,6 +7134,7 @@ Service.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -6965,6 +7143,7 @@ Service.obj: \ "$(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" \ @@ -6996,7 +7175,7 @@ Service.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7010,6 +7189,7 @@ Service.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7021,7 +7201,6 @@ Service.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -7044,7 +7223,6 @@ Service.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -7089,6 +7267,7 @@ SliceChecksums.obj: \ "$(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" \ @@ -7097,6 +7276,7 @@ SliceChecksums.obj: \ "$(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" \ @@ -7131,6 +7311,7 @@ SlicedData.obj: \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -7139,6 +7320,7 @@ SlicedData.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -7147,10 +7329,11 @@ SlicedData.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7173,6 +7356,7 @@ Stream.obj: \ "$(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\LocalObject.h" \ @@ -7180,6 +7364,7 @@ Stream.obj: \ "$(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" \ @@ -7213,7 +7398,7 @@ Stream.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7238,6 +7423,7 @@ StreamI.obj: \ "$(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\LocalObject.h" \ @@ -7245,6 +7431,7 @@ StreamI.obj: \ "$(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" \ @@ -7278,7 +7465,7 @@ StreamI.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7323,6 +7510,7 @@ StreamI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7349,6 +7537,7 @@ StreamSocket.obj: \ "$(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" \ @@ -7357,6 +7546,7 @@ StreamSocket.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -7391,7 +7581,7 @@ StreamSocket.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7438,6 +7628,7 @@ StreamSocket.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7459,6 +7650,7 @@ StringConverterPlugin.obj: \ "$(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" \ @@ -7467,6 +7659,7 @@ StringConverterPlugin.obj: \ "$(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" \ @@ -7513,7 +7706,7 @@ StringConverterPlugin.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7521,6 +7714,7 @@ StringConverterPlugin.obj: \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7565,6 +7759,7 @@ TcpAcceptor.obj: \ "$(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" \ @@ -7573,6 +7768,7 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -7607,7 +7803,7 @@ TcpAcceptor.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7655,6 +7851,7 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7695,6 +7892,7 @@ TcpConnector.obj: \ "$(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" \ @@ -7703,6 +7901,7 @@ TcpConnector.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -7737,7 +7936,7 @@ TcpConnector.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7785,6 +7984,7 @@ TcpConnector.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7828,6 +8028,7 @@ TcpEndpointI.obj: \ "$(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" \ @@ -7836,6 +8037,7 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -7871,7 +8073,7 @@ TcpEndpointI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7914,6 +8116,7 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7947,6 +8150,7 @@ TcpTransceiver.obj: \ "$(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" \ @@ -7955,6 +8159,7 @@ TcpTransceiver.obj: \ "$(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" \ @@ -7993,7 +8198,7 @@ TcpTransceiver.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8039,6 +8244,7 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8071,6 +8277,7 @@ ThreadPool.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -8079,6 +8286,7 @@ ThreadPool.obj: \ "$(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" \ @@ -8108,7 +8316,7 @@ ThreadPool.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8154,6 +8362,7 @@ ThreadPool.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8187,6 +8396,7 @@ TraceLevels.obj: \ "$(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" \ @@ -8195,6 +8405,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -8229,7 +8440,7 @@ TraceLevels.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8239,6 +8450,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8269,6 +8481,7 @@ TraceUtil.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -8277,6 +8490,7 @@ TraceUtil.obj: \ "$(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" \ @@ -8321,7 +8535,7 @@ TraceUtil.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8349,6 +8563,7 @@ TraceUtil.obj: \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8373,6 +8588,7 @@ Transceiver.obj: \ "$(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" \ @@ -8381,6 +8597,7 @@ Transceiver.obj: \ "$(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" \ @@ -8419,7 +8636,7 @@ Transceiver.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8451,6 +8668,7 @@ UdpConnector.obj: \ "$(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" \ @@ -8459,6 +8677,7 @@ UdpConnector.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -8493,7 +8712,7 @@ UdpConnector.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8537,6 +8756,7 @@ UdpConnector.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8577,6 +8797,7 @@ UdpEndpointI.obj: \ "$(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" \ @@ -8585,6 +8806,7 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -8620,7 +8842,7 @@ UdpEndpointI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8666,6 +8888,7 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8696,6 +8919,7 @@ UdpTransceiver.obj: \ "$(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" \ @@ -8704,6 +8928,7 @@ UdpTransceiver.obj: \ "$(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" \ @@ -8737,7 +8962,7 @@ UdpTransceiver.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8787,6 +9012,7 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8813,6 +9039,7 @@ WSAcceptor.obj: \ "$(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" \ @@ -8821,6 +9048,7 @@ WSAcceptor.obj: \ "$(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" \ @@ -8863,7 +9091,7 @@ WSAcceptor.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -8907,6 +9135,7 @@ WSAcceptor.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -8934,6 +9163,7 @@ WSConnector.obj: \ "$(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" \ @@ -8942,6 +9172,7 @@ WSConnector.obj: \ "$(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" \ @@ -8982,7 +9213,7 @@ WSConnector.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9026,6 +9257,7 @@ WSConnector.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -9057,6 +9289,7 @@ WSEndpoint.obj: \ "$(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" \ @@ -9065,6 +9298,7 @@ WSEndpoint.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -9111,7 +9345,7 @@ WSEndpoint.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9150,6 +9384,7 @@ WSEndpoint.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -9180,6 +9415,7 @@ WSTransceiver.obj: \ "$(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" \ @@ -9188,6 +9424,7 @@ WSTransceiver.obj: \ "$(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" \ @@ -9222,7 +9459,7 @@ WSTransceiver.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9268,6 +9505,7 @@ WSTransceiver.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -9305,6 +9543,7 @@ DLLMain.obj: \ "$(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" \ @@ -9313,6 +9552,7 @@ DLLMain.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Identity.h" \ @@ -9358,7 +9598,7 @@ DLLMain.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9371,6 +9611,7 @@ DLLMain.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -9382,7 +9623,6 @@ DLLMain.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -9404,7 +9644,6 @@ DLLMain.obj: \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -9427,6 +9666,7 @@ BuiltinSequences.obj: \ "$(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" \ @@ -9435,6 +9675,7 @@ BuiltinSequences.obj: \ "$(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" \ @@ -9453,7 +9694,7 @@ BuiltinSequences.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9475,6 +9716,7 @@ Communicator.obj: \ "$(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" \ @@ -9483,6 +9725,7 @@ Communicator.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -9517,7 +9760,7 @@ Communicator.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9526,6 +9769,7 @@ Communicator.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -9542,7 +9786,6 @@ Communicator.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -9563,6 +9806,7 @@ CommunicatorF.obj: \ "$(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" \ @@ -9571,6 +9815,7 @@ CommunicatorF.obj: \ "$(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" \ @@ -9589,6 +9834,7 @@ Connection.obj: \ "$(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" \ @@ -9597,6 +9843,7 @@ Connection.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -9631,7 +9878,7 @@ Connection.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9659,6 +9906,7 @@ ConnectionF.obj: \ "$(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" \ @@ -9667,6 +9915,7 @@ ConnectionF.obj: \ "$(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" \ @@ -9685,6 +9934,7 @@ Current.obj: \ "$(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" \ @@ -9693,6 +9943,7 @@ Current.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -9710,7 +9961,7 @@ Current.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9732,6 +9983,7 @@ Endpoint.obj: \ "$(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" \ @@ -9740,6 +9992,7 @@ Endpoint.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -9760,7 +10013,7 @@ Endpoint.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9782,6 +10035,7 @@ EndpointF.obj: \ "$(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" \ @@ -9790,6 +10044,7 @@ EndpointF.obj: \ "$(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" \ @@ -9808,6 +10063,7 @@ EndpointTypes.obj: \ "$(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" \ @@ -9816,31 +10072,10 @@ EndpointTypes.obj: \ "$(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\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ FacetMap.obj: \ FacetMap.cpp \ @@ -9856,6 +10091,7 @@ FacetMap.obj: \ "$(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" \ @@ -9864,6 +10100,7 @@ FacetMap.obj: \ "$(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" \ @@ -9882,7 +10119,7 @@ FacetMap.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9904,6 +10141,7 @@ Identity.obj: \ "$(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" \ @@ -9912,6 +10150,7 @@ Identity.obj: \ "$(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" \ @@ -9929,7 +10168,7 @@ Identity.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -9951,6 +10190,7 @@ ImplicitContext.obj: \ "$(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" \ @@ -9959,6 +10199,7 @@ ImplicitContext.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Identity.h" \ @@ -9979,7 +10220,7 @@ ImplicitContext.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10001,6 +10242,7 @@ ImplicitContextF.obj: \ "$(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" \ @@ -10009,6 +10251,7 @@ ImplicitContextF.obj: \ "$(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" \ @@ -10027,6 +10270,7 @@ Instrumentation.obj: \ "$(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" \ @@ -10035,6 +10279,7 @@ Instrumentation.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -10054,7 +10299,7 @@ Instrumentation.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10076,6 +10321,7 @@ InstrumentationF.obj: \ "$(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" \ @@ -10084,6 +10330,7 @@ InstrumentationF.obj: \ "$(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" \ @@ -10102,6 +10349,7 @@ LocalException.obj: \ "$(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" \ @@ -10110,6 +10358,7 @@ LocalException.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -10129,7 +10378,7 @@ LocalException.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10151,6 +10400,7 @@ Locator.obj: \ "$(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" \ @@ -10159,6 +10409,7 @@ Locator.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10193,7 +10444,7 @@ Locator.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10202,6 +10453,7 @@ Locator.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -10209,8 +10461,7 @@ Locator.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -10233,6 +10484,7 @@ LocatorF.obj: \ "$(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" \ @@ -10241,6 +10493,7 @@ LocatorF.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10275,7 +10528,7 @@ LocatorF.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10297,6 +10550,7 @@ Logger.obj: \ "$(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" \ @@ -10305,6 +10559,7 @@ Logger.obj: \ "$(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" \ @@ -10323,6 +10578,7 @@ LoggerF.obj: \ "$(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" \ @@ -10331,6 +10587,7 @@ LoggerF.obj: \ "$(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" \ @@ -10349,6 +10606,7 @@ Metrics.obj: \ "$(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" \ @@ -10357,6 +10615,7 @@ Metrics.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10391,7 +10650,7 @@ Metrics.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10400,13 +10659,13 @@ Metrics.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -10429,6 +10688,7 @@ ObjectAdapter.obj: \ "$(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" \ @@ -10437,6 +10697,7 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10471,7 +10732,7 @@ ObjectAdapter.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10498,6 +10759,7 @@ ObjectAdapterF.obj: \ "$(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" \ @@ -10506,6 +10768,7 @@ ObjectAdapterF.obj: \ "$(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" \ @@ -10524,6 +10787,7 @@ ObjectFactory.obj: \ "$(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" \ @@ -10532,6 +10796,7 @@ ObjectFactory.obj: \ "$(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" \ @@ -10550,7 +10815,6 @@ ObjectFactory.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10558,32 +10822,6 @@ ObjectFactory.obj: \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ -ObjectFactoryF.obj: \ - ObjectFactoryF.cpp \ - "$(includedir)\Ice\ObjectFactoryF.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\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)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - Plugin.obj: \ Plugin.cpp \ "$(includedir)\Ice\Plugin.h" \ @@ -10598,6 +10836,7 @@ Plugin.obj: \ "$(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" \ @@ -10606,6 +10845,7 @@ Plugin.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -10626,7 +10866,7 @@ Plugin.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10648,6 +10888,7 @@ PluginF.obj: \ "$(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" \ @@ -10656,6 +10897,7 @@ PluginF.obj: \ "$(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" \ @@ -10674,6 +10916,7 @@ Process.obj: \ "$(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" \ @@ -10682,6 +10925,7 @@ Process.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10716,7 +10960,7 @@ Process.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10725,13 +10969,13 @@ Process.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -10752,6 +10996,7 @@ ProcessF.obj: \ "$(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" \ @@ -10760,6 +11005,7 @@ ProcessF.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10794,7 +11040,7 @@ ProcessF.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10816,6 +11062,7 @@ Properties.obj: \ "$(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" \ @@ -10824,6 +11071,7 @@ Properties.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10858,7 +11106,7 @@ Properties.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10867,6 +11115,7 @@ Properties.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -10875,7 +11124,6 @@ Properties.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -10896,6 +11144,7 @@ PropertiesAdmin.obj: \ "$(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" \ @@ -10904,6 +11153,7 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -10938,7 +11188,7 @@ PropertiesAdmin.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -10947,6 +11197,7 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -10954,7 +11205,6 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -10975,6 +11225,7 @@ PropertiesF.obj: \ "$(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" \ @@ -10983,6 +11234,7 @@ PropertiesF.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -11017,7 +11269,7 @@ PropertiesF.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -11039,6 +11291,7 @@ RemoteLogger.obj: \ "$(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" \ @@ -11047,6 +11300,7 @@ RemoteLogger.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -11081,7 +11335,7 @@ RemoteLogger.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -11090,13 +11344,13 @@ RemoteLogger.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -11119,6 +11373,7 @@ Router.obj: \ "$(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" \ @@ -11127,6 +11382,7 @@ Router.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -11161,7 +11417,7 @@ Router.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -11170,13 +11426,13 @@ Router.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -11197,6 +11453,7 @@ RouterF.obj: \ "$(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" \ @@ -11205,6 +11462,7 @@ RouterF.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -11239,7 +11497,7 @@ RouterF.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -11261,6 +11519,7 @@ ServantLocator.obj: \ "$(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" \ @@ -11269,6 +11528,7 @@ ServantLocator.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -11287,7 +11547,7 @@ ServantLocator.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -11309,6 +11569,7 @@ ServantLocatorF.obj: \ "$(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" \ @@ -11317,6 +11578,7 @@ ServantLocatorF.obj: \ "$(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" \ @@ -11335,6 +11597,7 @@ SliceChecksumDict.obj: \ "$(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" \ @@ -11343,6 +11606,7 @@ SliceChecksumDict.obj: \ "$(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" \ @@ -11361,7 +11625,7 @@ SliceChecksumDict.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -11383,6 +11647,7 @@ Version.obj: \ "$(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" \ @@ -11391,6 +11656,7 @@ Version.obj: \ "$(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" \ @@ -11408,7 +11674,7 @@ Version.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp index c7cd625b253..79a9785d5e0 100644 --- a/cpp/src/Ice/ACM.cpp +++ b/cpp/src/Ice/ACM.cpp @@ -18,8 +18,10 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(ACMMonitor* p) { return p; } IceUtil::Shared* IceInternal::upCast(FactoryACMMonitor* p) { return p; } +#endif IceInternal::ACMConfig::ACMConfig(bool server) : timeout(IceUtil::Time::seconds(60)), @@ -107,7 +109,7 @@ IceInternal::FactoryACMMonitor::add(const ConnectionIPtr& connection) if(_connections.empty()) { _connections.insert(connection); - _instance->timer()->scheduleRepeated(this, _config.timeout / 2); + _instance->timer()->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2); } else { @@ -156,7 +158,7 @@ IceInternal::FactoryACMMonitor::acm(const IceUtil::Optional& timeout, { config.heartbeat = *heartbeat; } - return new ConnectionACMMonitor(this, _instance->timer(), config); + return ICE_MAKE_SHARED(ConnectionACMMonitor, ICE_SHARED_FROM_THIS, _instance->timer(), config); } Ice::ACM @@ -201,7 +203,7 @@ IceInternal::FactoryACMMonitor::runTimerTask() if(_connections.empty()) { - _instance->timer()->cancel(this); + _instance->timer()->cancel(ICE_SHARED_FROM_THIS); return; } } @@ -275,7 +277,7 @@ IceInternal::ConnectionACMMonitor::add(const ConnectionIPtr& connection) _connection = connection; if(_config.timeout != IceUtil::Time()) { - _timer->scheduleRepeated(this, _config.timeout / 2); + _timer->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2); } } @@ -286,7 +288,7 @@ IceInternal::ConnectionACMMonitor::remove(const ConnectionIPtr& connection) assert(_connection == connection); if(_config.timeout != IceUtil::Time()) { - _timer->cancel(this); + _timer->cancel(ICE_SHARED_FROM_THIS); } _connection = 0; } diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h index c791708a202..9d8f151daac 100644 --- a/cpp/src/Ice/ACM.h +++ b/cpp/src/Ice/ACM.h @@ -50,7 +50,8 @@ public: virtual Ice::ACM getACM() = 0; }; -class FactoryACMMonitor : public ACMMonitor, public ::IceUtil::Mutex +class FactoryACMMonitor : public ACMMonitor, public ::IceUtil::Mutex, + public ICE_ENABLE_SHARED_FROM_THIS(FactoryACMMonitor) { public: @@ -85,7 +86,8 @@ private: std::vector _reapedConnections; }; -class ConnectionACMMonitor : public ACMMonitor, public ::IceUtil::Mutex +class ConnectionACMMonitor : public ACMMonitor, public ::IceUtil::Mutex, + public ICE_ENABLE_SHARED_FROM_THIS(ConnectionACMMonitor) { public: diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 3c30bdc7301..59a0c8d4551 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -312,9 +312,9 @@ Ice::Application::main(int argc, char* argv[], const char* configFile) IceInternal::Application::_appName = argv[0]; } - if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger())) + if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger())) { - setProcessLogger(new LoggerI(argv[0], "", true, IceUtil::getProcessStringConverter())); + setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", true, IceUtil::getProcessStringConverter())); } InitializationData initData; @@ -364,12 +364,12 @@ Ice::Application::main(int argc, wchar_t* argv[], const Ice::InitializationData& int Ice::Application::main(int argc, char* argv[], const InitializationData& initializationData) { - if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger())) + if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger())) { const bool convert = initializationData.properties ? initializationData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 && initializationData.properties->getProperty("Ice.StdErr").empty() : true; - setProcessLogger(new LoggerI(argv[0], "", convert, IceUtil::getProcessStringConverter())); + setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", convert, IceUtil::getProcessStringConverter())); } if(IceInternal::Application::_communicator != 0) @@ -655,13 +655,13 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD // If the process logger is the default logger, we now replace it with a // a logger which is using the program name for the prefix. // - if(initData.properties->getProperty("Ice.ProgramName") != "" && LoggerIPtr::dynamicCast(getProcessLogger())) + if(initData.properties->getProperty("Ice.ProgramName") != "" && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger())) { const bool convert = initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 && initData.properties->getProperty("Ice.StdErr").empty(); - setProcessLogger(new LoggerI(initData.properties->getProperty("Ice.ProgramName"), "", convert, + setProcessLogger(ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert, IceUtil::getProcessStringConverter())); } diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp index 71d8106bd79..69ba7d0b5ab 100644 --- a/cpp/src/Ice/AsyncResult.cpp +++ b/cpp/src/Ice/AsyncResult.cpp @@ -20,7 +20,9 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; } +#endif const unsigned char Ice::AsyncResult::OK = 0x1; const unsigned char Ice::AsyncResult::Done = 0x2; @@ -51,10 +53,10 @@ AsyncResult::getConnection() const return 0; } -ObjectPrx +ObjectPrxPtr AsyncResult::getProxy() const { - return 0; + return ICE_NULLPTR; } bool @@ -107,11 +109,13 @@ AsyncResult::sentSynchronously() const return _sentSynchronously; } +#ifndef ICE_CPP11_MAPPING LocalObjectPtr AsyncResult::getCookie() const { return _cookie; } +#endif const std::string& AsyncResult::getOperation() const @@ -204,6 +208,25 @@ AsyncResult::__check(const AsyncResultPtr& r, const string& operation) } } +#ifdef ICE_CPP11_MAPPING +AsyncResult::AsyncResult(const CommunicatorPtr& communicator, + const IceInternal::InstancePtr& instance, + const string& op, + const CallbackBasePtr& callback) : + _instance(instance), + _sentSynchronously(false), + _is(instance.get(), Ice::currentProtocolEncoding), + _communicator(communicator), + _operation(op), + _callback(callback), + _state(0) +{ + if(!_callback) + { + throw IceUtil::IllegalArgumentException(__FILE__, __LINE__); + } +} +#else AsyncResult::AsyncResult(const CommunicatorPtr& communicator, const IceInternal::InstancePtr& instance, const string& op, @@ -224,6 +247,7 @@ AsyncResult::AsyncResult(const CommunicatorPtr& communicator, } const_cast(_callback) = _callback->verify(_cookie); } +#endif AsyncResult::~AsyncResult() { @@ -266,7 +290,7 @@ AsyncResult::finished(bool ok) _observer.detach(); } _monitor.notifyAll(); - return _callback; + return _callback != ICE_NULLPTR; } bool @@ -282,7 +306,7 @@ AsyncResult::finished(const Ice::Exception& ex) _observer.detach(); } _monitor.notifyAll(); - return _callback; + return _callback != ICE_NULLPTR; } void @@ -315,7 +339,7 @@ AsyncResult::invokeSentAsync() // try { - _instance->clientThreadPool()->dispatch(new AsynchronousSent(_cachedConnection, this)); + _instance->clientThreadPool()->dispatch(new AsynchronousSent(_cachedConnection, ICE_SHARED_FROM_THIS)); } catch(const Ice::CommunicatorDestroyedException&) { @@ -349,7 +373,7 @@ AsyncResult::invokeCompletedAsync() // CommunicatorDestroyedCompleted is the only exception that can propagate directly // from this method. // - _instance->clientThreadPool()->dispatch(new AsynchronousCompleted(_cachedConnection, this)); + _instance->clientThreadPool()->dispatch(new AsynchronousCompleted(_cachedConnection, ICE_SHARED_FROM_THIS)); } void @@ -359,7 +383,7 @@ AsyncResult::invokeSent() try { - AsyncResultPtr self(this); + AsyncResultPtr self(ICE_SHARED_FROM_THIS); _callback->sent(self); } catch(const std::exception& ex) @@ -373,7 +397,7 @@ AsyncResult::invokeSent() if(_observer) { - ObjectPrx proxy = getProxy(); + ObjectPrxPtr proxy = getProxy(); if(!proxy || !proxy->ice_isTwoway()) { _observer.detach(); @@ -388,7 +412,7 @@ AsyncResult::invokeCompleted() try { - AsyncResultPtr self(this); + AsyncResultPtr self(ICE_SHARED_FROM_THIS); _callback->completed(self); } catch(const std::exception& ex) @@ -416,7 +440,11 @@ AsyncResult::cancel(const Ice::LocalException& ex) } handler = _cancellationHandler; } +#ifdef ICE_CPP11_MAPPING + handler->asyncRequestCanceled(dynamic_pointer_cast(shared_from_this()), ex); +#else handler->asyncRequestCanceled(OutgoingAsyncBasePtr::dynamicCast(this), ex); +#endif } void @@ -526,9 +554,10 @@ public: // versus the generated inline version of the begin_ method having // passed a pointer to the dummy delegate. // -CallbackBasePtr IceInternal::__dummyCallback = new DummyCallback; +CallbackBasePtr IceInternal::__dummyCallback = ICE_MAKE_SHARED(DummyCallback); -#ifdef ICE_CPP11 +#ifndef ICE_CPP11_MAPPING +# ifdef ICE_CPP11_COMPILER Ice::CallbackPtr Ice::newCallback(const ::IceInternal::Function& completed, @@ -564,7 +593,7 @@ Ice::newCallback(const ::IceInternal::Function& co if(_sent != nullptr) { _sent(result); - } + } } virtual bool @@ -581,6 +610,7 @@ Ice::newCallback(const ::IceInternal::Function& co return new Cpp11CB(completed, sent); } +# endif #endif void @@ -596,4 +626,3 @@ IceInternal::CallbackBase::checkCallback(bool obj, bool cb) } } - diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index e08914e0a7e..3bd7751a1e7 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1580,16 +1580,28 @@ IceInternal::BasicStream::read(vector& v) } void -IceInternal::BasicStream::write(const ObjectPrx& v) +#ifndef ICE_CPP11_MAPPING +IceInternal::BasicStream::write(const ObjectPrxPtr& v) +#else +IceInternal::BasicStream::writeProxy(const ObjectPrxPtr& v) +#endif { _instance->proxyFactory()->proxyToStream(v, this); } +#ifndef ICE_CPP11_MAPPING void -IceInternal::BasicStream::read(ObjectPrx& v) +IceInternal::BasicStream::read(ObjectPrxPtr& v) { v = _instance->proxyFactory()->streamToProxy(this); } +#else +ObjectPrxPtr +IceInternal::BasicStream::readProxy() +{ + return _instance->proxyFactory()->streamToProxy(this); +} +#endif Int IceInternal::BasicStream::readEnum(Int maxValue) @@ -1904,20 +1916,27 @@ IceInternal::BasicStream::EncapsDecoder::readTypeId(bool isIndex) } } -Ice::ObjectPtr +Ice::ValuePtr IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) { - Ice::ObjectPtr v; + Ice::ValuePtr v; // // Try to find a factory registered for the specific type. // +#ifdef ICE_CPP11_MAPPING + function userFactory = _servantFactoryManager->find(typeId); + if(userFactory) + { + v = userFactory(typeId); + } +#else ObjectFactoryPtr userFactory = _servantFactoryManager->find(typeId); if(userFactory) { v = userFactory->create(typeId); } - +#endif // // If that fails, invoke the default factory if one has been // registered. @@ -1927,7 +1946,11 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) userFactory = _servantFactoryManager->find(""); if(userFactory) { +#ifdef ICE_CPP11_MAPPING + v = userFactory(typeId); +#else v = userFactory->create(typeId); +#endif } } @@ -1937,12 +1960,21 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) // if(!v) { +#ifdef ICE_CPP11_MAPPING + function of = IceInternal::factoryTable->getObjectFactory(typeId); + if(of) + { + v = of(typeId); + assert(v); + } +#else ObjectFactoryPtr of = IceInternal::factoryTable->getObjectFactory(typeId); if(of) { v = of->create(typeId); assert(v); } +#endif } return v; @@ -1990,7 +2022,7 @@ IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patc } void -IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ObjectPtr& v) +IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v) { // // Add the object to the map of un-marshalled objects, this must @@ -2030,10 +2062,12 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ObjectP { try { +#ifndef ICE_CPP11_MAPPING if(_stream->instance()->collectObjects()) { v->ice_collectable(true); } +#endif v->ice_postUnmarshal(); } catch(const std::exception& ex) @@ -2063,10 +2097,12 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ObjectP { try { +#ifndef ICE_CPP11_MAPPING if(_stream->instance()->collectObjects()) { (*p)->ice_collectable(true); } +#endif (*p)->ice_postUnmarshal(); } catch(const std::exception& ex) @@ -2107,7 +2143,7 @@ IceInternal::BasicStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patch // Calling the patch function for null instances is necessary for correct functioning of Ice for // Python and Ruby. // - ObjectPtr nil; + ValuePtr nil; patchFunc(patchAddr, nil); } else @@ -2337,7 +2373,7 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance() // startSlice(); const string mostDerivedId = _typeId; - ObjectPtr v; + ValuePtr v; while(true) { // @@ -2397,7 +2433,7 @@ IceInternal::BasicStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patch // if(patchFunc) { - ObjectPtr nil; + ValuePtr nil; patchFunc(patchAddr, nil); } } @@ -2685,7 +2721,7 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice() // // Preserve this slice. // - SliceInfoPtr info = new SliceInfo; + SliceInfoPtr info = ICE_MAKE_SHARED(SliceInfo); info->typeId = _current->typeId; info->compactId = _current->compactId; info->hasOptionalMembers = _current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS; @@ -2768,7 +2804,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat // startSlice(); const string mostDerivedId = _current->typeId; - Ice::ObjectPtr v; + Ice::ValuePtr v; const CompactIdResolverPtr& compactIdResolver = _stream->instance()->initializationData().compactIdResolver; while(true) { @@ -2853,7 +2889,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat v = newInstance(Object::ice_staticId()); if(!v) { - v = new UnknownSlicedObject(mostDerivedId); + v = ICE_MAKE_SHARED(UnknownSlicedObject, mostDerivedId); } break; @@ -2905,7 +2941,7 @@ IceInternal::BasicStream::EncapsDecoder11::readSlicedData() // enclosing object. // const IndexList& table = _current->indirectionTables[n]; - vector& objects = _current->slices[n]->objects; + vector& objects = _current->slices[n]->objects; objects.resize(table.size()); IndexList::size_type j = 0; for(IndexList::const_iterator p = table.begin(); p != table.end(); ++p) @@ -2913,7 +2949,7 @@ IceInternal::BasicStream::EncapsDecoder11::readSlicedData() addPatchEntry(*p, &patchHandle, &objects[j++]); } } - return new SlicedData(_current->slices); + return ICE_MAKE_SHARED(SlicedData, _current->slices); } Int @@ -2932,7 +2968,7 @@ IceInternal::BasicStream::EncapsEncoder::registerTypeId(const string& typeId) } void -IceInternal::BasicStream::EncapsEncoder10::write(const ObjectPtr& v) +IceInternal::BasicStream::EncapsEncoder10::write(const ValuePtr& v) { // // Object references are encoded as a negative integer in 1.0. @@ -3078,7 +3114,7 @@ IceInternal::BasicStream::EncapsEncoder10::writePendingObjects() } Int -IceInternal::BasicStream::EncapsEncoder10::registerObject(const ObjectPtr& v) +IceInternal::BasicStream::EncapsEncoder10::registerObject(const ValuePtr& v) { assert(v); @@ -3109,7 +3145,7 @@ IceInternal::BasicStream::EncapsEncoder10::registerObject(const ObjectPtr& v) } void -IceInternal::BasicStream::EncapsEncoder11::write(const ObjectPtr& v) +IceInternal::BasicStream::EncapsEncoder11::write(const ValuePtr& v) { if(!v) { @@ -3354,7 +3390,7 @@ IceInternal::BasicStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& } void -IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ObjectPtr& v) +IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ValuePtr& v) { assert(v); @@ -3392,4 +3428,3 @@ IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ObjectPtr& v) _stream->writeSize(1); // Object instance marker. v->__write(_stream); } - diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index c34de544df7..04bee6e06d5 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -25,7 +25,7 @@ class BatchRequestI : public Ice::BatchRequest { public: - BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrx& proxy, const string& operation, int size) : + BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrxPtr& proxy, const string& operation, int size) : _queue(queue), _proxy(proxy), _operation(operation), _size(size) { } @@ -48,7 +48,7 @@ public: return _operation; } - virtual const Ice::ObjectPrx& + virtual const Ice::ObjectPrxPtr& getProxy() const { return _proxy; @@ -57,7 +57,7 @@ public: private: BatchRequestQueue& _queue; - const Ice::ObjectPrx& _proxy; + const Ice::ObjectPrxPtr& _proxy; const std::string& _operation; const int _size; }; @@ -101,7 +101,7 @@ BatchRequestQueue::prepareBatchRequest(BasicStream* os) } void -BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& proxy, const std::string& operation) +BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation) { // // No need for synchronization, no other threads are supposed @@ -116,7 +116,11 @@ BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& pro if(_maxSize > 0 && _batchStream.b.size() >= _maxSize) { +#ifdef ICE_CPP11_MAPPING + proxy->ice_flushBatchRequests_async(); +#else proxy->begin_ice_flushBatchRequests(); +#endif } assert(_batchMarker < _batchStream.b.size()); diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h index 6a082af1921..e562e637197 100644 --- a/cpp/src/Ice/BatchRequestQueue.h +++ b/cpp/src/Ice/BatchRequestQueue.h @@ -30,7 +30,7 @@ public: BatchRequestQueue(const InstancePtr&, bool); void prepareBatchRequest(BasicStream*); - void finishBatchRequest(BasicStream*, const Ice::ObjectPrx&, const std::string&); + void finishBatchRequest(BasicStream*, const Ice::ObjectPrxPtr&, const std::string&); void abortBatchRequest(BasicStream*); int swap(BasicStream*); diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp index 6a641c38037..20349210b21 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.cpp +++ b/cpp/src/Ice/CollocatedRequestHandler.cpp @@ -35,7 +35,15 @@ public: CollocatedRequestHandler* handler, Int requestId, Int batchRequestNum) : - _out(out), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum) + _out(out), + _os(os), +#ifdef ICE_CPP11_MAPPING + _handler(dynamic_pointer_cast(handler->shared_from_this())), +#else + _handler(handler), +#endif + _requestId(requestId), + _batchRequestNum(batchRequestNum) { } @@ -63,7 +71,7 @@ public: InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync, BasicStream* os, - CollocatedRequestHandler* handler, + const CollocatedRequestHandlerPtr& handler, Int requestId, Int batchRequestNum) : _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum) @@ -103,7 +111,7 @@ fillInValue(BasicStream* os, int pos, Int value) CollocatedRequestHandler::CollocatedRequestHandler(const ReferencePtr& ref, const ObjectAdapterPtr& adapter) : RequestHandler(ref), - _adapter(ObjectAdapterIPtr::dynamicCast(adapter)), + _adapter(ICE_DYNAMIC_CAST(ObjectAdapterI, adapter)), _dispatcher(_reference->getInstance()->initializationData().dispatcher), _logger(_reference->getInstance()->initializationData().logger), // Cached for better performance. _traceLevels(_reference->getInstance()->traceLevels()), // Cached for better performance. @@ -118,7 +126,11 @@ CollocatedRequestHandler::~CollocatedRequestHandler() RequestHandlerPtr CollocatedRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler) { +#ifdef ICE_CPP11_MAPPING + return previousHandler.get() == this ? newHandler : dynamic_pointer_cast(shared_from_this()); +#else return previousHandler.get() == this ? newHandler : this; +#endif } bool @@ -190,7 +202,7 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs return; } - OutgoingAsyncPtr o = OutgoingAsyncPtr::dynamicCast(outAsync); + OutgoingAsyncPtr o = ICE_DYNAMIC_CAST(OutgoingAsync, outAsync); if(o) { for(map::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q) @@ -262,15 +274,32 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba { Lock sync(*this); - outAsync->cancelable(this); // This will throw if the request is canceled + // + // This will throw if the request is canceled + // +#ifdef ICE_CPP11_MAPPING + outAsync->cancelable(dynamic_pointer_cast(shared_from_this())); +#else + outAsync->cancelable(this); +#endif if(_response) { requestId = ++_requestId; +#ifdef ICE_CPP11_MAPPING + _asyncRequests.insert(make_pair(requestId, + dynamic_pointer_cast(outAsync->shared_from_this()))); +#else _asyncRequests.insert(make_pair(requestId, outAsync)); +#endif } +#ifdef ICE_CPP11_MAPPING + _sendAsyncRequests.insert(make_pair( + dynamic_pointer_cast(outAsync->shared_from_this()), requestId)); +#else _sendAsyncRequests.insert(make_pair(outAsync, requestId)); +#endif } catch(...) { @@ -280,8 +309,17 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba outAsync->attachCollocatedObserver(_adapter, requestId); +#ifdef ICE_CPP11_MAPPING + _adapter->getThreadPool()->dispatch(new InvokeAllAsync( + dynamic_pointer_cast(outAsync->shared_from_this()), + outAsync->getOs(), + dynamic_pointer_cast(shared_from_this()), + requestId, + batchRequestNum)); +#else _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, requestId, batchRequestNum)); +#endif return AsyncStatusQueued; } @@ -392,7 +430,12 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync) { { Lock sync(*this); +#ifdef ICE_CPP11_MAPPING + if(_sendAsyncRequests.erase(outAsync ? + dynamic_pointer_cast(outAsync->shared_from_this()) : nullptr) == 0) +#else if(_sendAsyncRequests.erase(outAsync) == 0) +#endif { return false; // The request timed-out. } diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h index 248984ed647..f98407c0ef3 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.h +++ b/cpp/src/Ice/CollocatedRequestHandler.h @@ -19,12 +19,13 @@ #include #include #include +#include namespace Ice { class ObjectAdapterI; -typedef IceUtil::Handle ObjectAdapterIPtr; +ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI); } @@ -36,7 +37,12 @@ class Outgoing; class OutgoingAsyncBase; class OutgoingAsync; -class CollocatedRequestHandler : public RequestHandler, public ResponseHandler, private IceUtil::Monitor +class CollocatedRequestHandler : public RequestHandler, + public ResponseHandler, + private IceUtil::Monitor +#ifndef ICE_CPP11_MAPPING + , public virtual ::IceUtil::Shared +#endif { public: @@ -86,7 +92,7 @@ private: std::map _requests; std::map _asyncRequests; }; -typedef IceUtil::Handle CollocatedRequestHandlerPtr; +ICE_DEFINE_PTR(CollocatedRequestHandlerPtr, CollocatedRequestHandler); } diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 985acb23aa9..4fddd5e9e62 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -56,26 +56,26 @@ Ice::CommunicatorI::isShutdown() const return _instance->objectAdapterFactory()->isShutdown(); } -ObjectPrx +ObjectPrxPtr Ice::CommunicatorI::stringToProxy(const string& s) const { return _instance->proxyFactory()->stringToProxy(s); } string -Ice::CommunicatorI::proxyToString(const ObjectPrx& proxy) const +Ice::CommunicatorI::proxyToString(const ObjectPrxPtr& proxy) const { return _instance->proxyFactory()->proxyToString(proxy); } -ObjectPrx +ObjectPrxPtr Ice::CommunicatorI::propertyToProxy(const string& p) const { return _instance->proxyFactory()->propertyToProxy(p); } PropertyDict -Ice::CommunicatorI::proxyToProperty(const ObjectPrx& proxy, const string& property) const +Ice::CommunicatorI::proxyToProperty(const ObjectPrxPtr& proxy, const string& property) const { return _instance->proxyFactory()->proxyToProperty(proxy, property); } @@ -95,7 +95,7 @@ Ice::CommunicatorI::identityToString(const Identity& ident) const ObjectAdapterPtr Ice::CommunicatorI::createObjectAdapter(const string& name) { - return _instance->objectAdapterFactory()->createObjectAdapter(name, 0); + return _instance->objectAdapterFactory()->createObjectAdapter(name, ICE_NULLPTR); } ObjectAdapterPtr @@ -108,11 +108,11 @@ Ice::CommunicatorI::createObjectAdapterWithEndpoints(const string& name, const s } getProperties()->setProperty(oaName + ".Endpoints", endpoints); - return _instance->objectAdapterFactory()->createObjectAdapter(oaName, 0); + return _instance->objectAdapterFactory()->createObjectAdapter(oaName, ICE_NULLPTR); } ObjectAdapterPtr -Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrx& router) +Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrxPtr& router) { string oaName = name; if(oaName.empty()) @@ -129,17 +129,31 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout return _instance->objectAdapterFactory()->createObjectAdapter(oaName, router); } +#ifdef ICE_CPP11_MAPPING void -Ice::CommunicatorI::addObjectFactory(const ObjectFactoryPtr& factory, const string& id) +Ice::CommunicatorI::addObjectFactory(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 +{ + return _instance->servantFactoryManager()->find(id); +} +#else +void +Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id) { _instance->servantFactoryManager()->add(factory, id); } -ObjectFactoryPtr +::Ice::ObjectFactoryPtr Ice::CommunicatorI::findObjectFactory(const string& id) const { return _instance->servantFactoryManager()->find(id); } +#endif PropertiesPtr Ice::CommunicatorI::getProperties() const @@ -159,26 +173,26 @@ Ice::CommunicatorI::getObserver() const return _instance->initializationData().observer; } -RouterPrx +RouterPrxPtr Ice::CommunicatorI::getDefaultRouter() const { return _instance->referenceFactory()->getDefaultRouter(); } void -Ice::CommunicatorI::setDefaultRouter(const RouterPrx& router) +Ice::CommunicatorI::setDefaultRouter(const RouterPrxPtr& router) { _instance->setDefaultRouter(router); } -LocatorPrx +LocatorPrxPtr Ice::CommunicatorI::getDefaultLocator() const { return _instance->referenceFactory()->getDefaultLocator(); } void -Ice::CommunicatorI::setDefaultLocator(const LocatorPrx& locator) +Ice::CommunicatorI::setDefaultLocator(const LocatorPrxPtr& locator) { _instance->setDefaultLocator(locator); } @@ -195,6 +209,117 @@ Ice::CommunicatorI::getPluginManager() const return _instance->pluginManager(); } +namespace +{ + +const ::std::string __flushBatchRequests_name = "flushBatchRequests"; + +} + +#ifdef ICE_CPP11_MAPPING +void +Ice::CommunicatorI::flushBatchRequests() +{ + promise promise; + flushBatchRequests_async( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(move(ex)); + }, + [&](bool sentSynchronously) + { + promise.set_value(sentSynchronously); + }); + promise.get_future().get(); +} + +::std::function +Ice::CommunicatorI::flushBatchRequests_async( + function completed, + function exception, + function sent) +{ + class FlushBatchRequestsCallback : public CallbackBase + { + public: + + FlushBatchRequestsCallback(function exception, + function sent, + shared_ptr communicator) : + _exception(move(exception)), + _sent(move(sent)), + _communicator(move(communicator)) + { + } + + virtual void sent(const AsyncResultPtr& result) const + { + try + { + AsyncResult::__check(result, _communicator.get(), __flushBatchRequests_name); + result->__wait(); + } + catch(const ::Ice::Exception&) + { + _exception(current_exception()); + } + + if(_sent) + { + _sent(result->sentSynchronously()); + } + } + + virtual bool hasSentCallback() const + { + return true; + } + + + virtual void + completed(const ::Ice::AsyncResultPtr& result) const + { + try + { + AsyncResult::__check(result, _communicator.get(), __flushBatchRequests_name); + result->__wait(); + } + catch(const ::Ice::Exception&) + { + _exception(current_exception()); + } + } + + private: + + function _exception; + function _sent; + shared_ptr _communicator; + }; + + OutgoingConnectionFactoryPtr connectionFactory = _instance->outgoingConnectionFactory(); + ObjectAdapterFactoryPtr adapterFactory = _instance->objectAdapterFactory(); + + auto self = dynamic_pointer_cast(shared_from_this()); + + auto result = make_shared(self, _instance, __flushBatchRequests_name, + make_shared(move(exception), move(sent), self)); + + connectionFactory->flushAsyncBatchRequests(result); + adapterFactory->flushAsyncBatchRequests(result); + + // + // Inform the callback that we have finished initiating all of the + // flush requests. + // + result->ready(); + return [result]() + { + result->cancel(); + }; +} +#else void Ice::CommunicatorI::flushBatchRequests() { @@ -224,7 +349,7 @@ AsyncResultPtr Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function& exception, const IceInternal::Function& sent) { -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER class Cpp11CB : public IceInternal::Cpp11FnCallbackNC { @@ -254,20 +379,13 @@ Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function__wait(); } +#endif -ObjectPrx +ObjectPrxPtr Ice::CommunicatorI::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId) { return _instance->createAdmin(adminAdapter, adminId); } -ObjectPrx +ObjectPrxPtr Ice::CommunicatorI::getAdmin() const { return _instance->getAdmin(); @@ -338,27 +457,27 @@ Ice::CommunicatorI::findAllAdminFacets() return _instance->findAllAdminFacets(); } -Ice::CommunicatorI::CommunicatorI(const InitializationData& initData) +CommunicatorIPtr +Ice::CommunicatorI::create(const InitializationData& initData) { - __setNoDelete(true); + Ice::CommunicatorIPtr communicator = ICE_MAKE_SHARED(CommunicatorI); try { - const_cast(_instance) = new Instance(this, initData); + const_cast(communicator->_instance) = new Instance(communicator, initData); // // Keep a reference to the dynamic library list to ensure // the libraries are not unloaded until this Communicator's // destructor is invoked. // - const_cast(_dynamicLibraryList) = _instance->dynamicLibraryList(); + const_cast(communicator->_dynamicLibraryList) = communicator->_instance->dynamicLibraryList(); } catch(...) { - destroy(); - __setNoDelete(false); + communicator->destroy(); throw; } - __setNoDelete(false); + return communicator; } Ice::CommunicatorI::~CommunicatorI() @@ -375,7 +494,7 @@ Ice::CommunicatorI::finishSetup(int& argc, char* argv[]) { try { - _instance->finishSetup(argc, argv, this); + _instance->finishSetup(argc, argv, ICE_SHARED_FROM_THIS); } catch(...) { diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 373a56c316e..d0ba4285695 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -20,30 +20,39 @@ namespace Ice { -class CommunicatorI : public Communicator +class CommunicatorI; +ICE_DEFINE_PTR(CommunicatorIPtr, CommunicatorI); + +class CommunicatorI : public ICE_ENABLE_SHARED_FROM_THIS(CommunicatorI), + public Communicator { public: - + virtual void destroy(); virtual void shutdown(); virtual void waitForShutdown(); virtual bool isShutdown() const; - virtual ObjectPrx stringToProxy(const std::string&) const; - virtual std::string proxyToString(const ObjectPrx&) const; + virtual ObjectPrxPtr stringToProxy(const std::string&) const; + virtual std::string proxyToString(const ObjectPrxPtr&) const; - virtual ObjectPrx propertyToProxy(const std::string&) const; - virtual PropertyDict proxyToProperty(const ObjectPrx&, const std::string&) const; + virtual ObjectPrxPtr propertyToProxy(const std::string&) const; + virtual PropertyDict proxyToProperty(const ObjectPrxPtr&, const std::string&) const; virtual Identity stringToIdentity(const std::string&) const; virtual std::string identityToString(const Identity&) const; virtual ObjectAdapterPtr createObjectAdapter(const std::string&); virtual ObjectAdapterPtr createObjectAdapterWithEndpoints(const std::string&, const std::string&); - virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrx&); + virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrxPtr&); +#ifdef ICE_CPP11_MAPPING + virtual void addObjectFactory(std::function (const std::string&)>, const std::string&); + virtual std::function<::std::shared_ptr (const std::string&)> findObjectFactory(const std::string&) const; +#else virtual void addObjectFactory(const ObjectFactoryPtr&, const std::string&); virtual ObjectFactoryPtr findObjectFactory(const std::string&) const; +#endif virtual ImplicitContextPtr getImplicitContext() const; @@ -51,16 +60,23 @@ public: virtual LoggerPtr getLogger() const; virtual Ice::Instrumentation::CommunicatorObserverPtr getObserver() const; - virtual RouterPrx getDefaultRouter() const; - virtual void setDefaultRouter(const RouterPrx&); + virtual RouterPrxPtr getDefaultRouter() const; + virtual void setDefaultRouter(const RouterPrxPtr&); - virtual LocatorPrx getDefaultLocator() const; - virtual void setDefaultLocator(const LocatorPrx&); + virtual LocatorPrxPtr getDefaultLocator() const; + virtual void setDefaultLocator(const LocatorPrxPtr&); virtual PluginManagerPtr getPluginManager() const; virtual void flushBatchRequests(); +#ifdef ICE_CPP11_MAPPING + virtual ::std::function + flushBatchRequests_async( + ::std::function completed, + ::std::function exception = nullptr, + ::std::function sent = nullptr); +#else virtual AsyncResultPtr begin_flushBatchRequests(); virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0); virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Communicator_flushBatchRequestsPtr&, @@ -71,18 +87,21 @@ public: const IceInternal::Function& = IceInternal::Function()); virtual void end_flushBatchRequests(const AsyncResultPtr&); +#endif - virtual ObjectPrx createAdmin(const ObjectAdapterPtr&, const Identity&); - virtual ObjectPrx getAdmin() const; + virtual ObjectPrxPtr createAdmin(const ObjectAdapterPtr&, const Identity&); + virtual ObjectPrxPtr getAdmin() const; virtual void addAdminFacet(const ObjectPtr&, const std::string&); virtual ObjectPtr removeAdminFacet(const std::string&); virtual ObjectPtr findAdminFacet(const std::string&); virtual FacetMap findAllAdminFacets(); + virtual ~CommunicatorI(); + private: - CommunicatorI(const InitializationData&); - virtual ~CommunicatorI(); + static CommunicatorIPtr + create(const InitializationData&); // // Certain initialization tasks need to be completed after the diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index caabcbd3e75..3818144f279 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -23,9 +23,11 @@ using namespace std; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(ConnectRequestHandler* p) { return p; } +#endif -ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy) : +ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrxPtr& proxy) : RequestHandler(ref), _proxy(proxy), _initialized(false), @@ -33,25 +35,21 @@ ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice: { } -ConnectRequestHandler::~ConnectRequestHandler() -{ -} - RequestHandlerPtr -ConnectRequestHandler::connect(const Ice::ObjectPrx& proxy) +ConnectRequestHandler::connect(const Ice::ObjectPrxPtr& proxy) { Lock sync(*this); if(!initialized()) { _proxies.insert(proxy); } - return _requestHandler ? _requestHandler : this; + return _requestHandler ? _requestHandler : ICE_SHARED_FROM_THIS; } RequestHandlerPtr ConnectRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler) { - return previousHandler.get() == this ? newHandler : this; + return previousHandler.get() == this ? newHandler : ICE_SHARED_FROM_THIS; } bool @@ -77,7 +75,7 @@ ConnectRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out) Lock sync(*this); if(!_initialized) { - out->cancelable(this); // This will throw if the request is canceled + out->cancelable(ICE_SHARED_FROM_THIS); // This will throw if the request is canceled } if(!initialized()) @@ -205,7 +203,11 @@ ConnectRequestHandler::setConnection(const Ice::ConnectionIPtr& connection, bool // add this proxy to the router info object. // RouterInfoPtr ri = _reference->getRouterInfo(); +#ifdef ICE_CPP11_MAPPING + if(ri && !ri->addProxy(_proxy, dynamic_pointer_cast(shared_from_this()))) +#else if(ri && !ri->addProxy(_proxy, this)) +#endif { return; // The request handler will be initialized once addProxy returns. } @@ -233,7 +235,7 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex) // try { - _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this); + _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, ICE_SHARED_FROM_THIS); } catch(const Ice::CommunicatorDestroyedException&) { @@ -342,7 +344,7 @@ ConnectRequestHandler::flushRequests() exception.reset(ex.get()->ice_clone()); // Remove the request handler before retrying. - _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this); + _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, ICE_SHARED_FROM_THIS); if(req.out) { @@ -376,10 +378,10 @@ ConnectRequestHandler::flushRequests() // if(_reference->getCacheConnection() && !exception.get()) { - _requestHandler = new ConnectionRequestHandler(_reference, _connection, _compress); - for(set::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p) + _requestHandler = ICE_MAKE_SHARED(ConnectionRequestHandler, _reference, _connection, _compress); + for(set::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p) { - (*p)->__updateRequestHandler(this, _requestHandler); + (*p)->__updateRequestHandler(ICE_SHARED_FROM_THIS, _requestHandler); } } @@ -394,10 +396,11 @@ ConnectRequestHandler::flushRequests() // Only remove once all the requests are flushed to // guarantee serialization. // - _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this); + _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, ICE_SHARED_FROM_THIS); _proxies.clear(); _proxy = 0; // Break cyclic reference count. notifyAll(); } } + diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index fc202d1c893..e8d61faa379 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -30,14 +30,14 @@ namespace IceInternal class ConnectRequestHandler : public RequestHandler, public Reference::GetConnectionCallback, public RouterInfo::AddProxyCallback, - public IceUtil::Monitor + public IceUtil::Monitor, + public ICE_ENABLE_SHARED_FROM_THIS(ConnectRequestHandler) { public: - ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&); - virtual ~ConnectRequestHandler(); + ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrxPtr&); - RequestHandlerPtr connect(const Ice::ObjectPrx&); + RequestHandlerPtr connect(const Ice::ObjectPrxPtr&); virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&); virtual bool sendRequest(ProxyOutgoingBase*); @@ -69,8 +69,8 @@ private: ProxyOutgoingAsyncBasePtr outAsync; }; - Ice::ObjectPrx _proxy; - std::set _proxies; + Ice::ObjectPrxPtr _proxy; + std::set _proxies; Ice::ConnectionIPtr _connection; bool _compress; diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h index f60cdaa1804..054567aae84 100644 --- a/cpp/src/Ice/ConnectRequestHandlerF.h +++ b/cpp/src/Ice/ConnectRequestHandlerF.h @@ -17,8 +17,12 @@ namespace IceInternal { class ConnectRequestHandler; +#ifdef ICE_CPP11_MAPPING +typedef ::std::shared_ptr ConnectRequestHandlerPtr; +#else ICE_API IceUtil::Shared* upCast(ConnectRequestHandler*); typedef IceInternal::Handle ConnectRequestHandlerPtr; +#endif } diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 3dbef2a5a6d..6ce8b78d45e 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -44,7 +44,10 @@ using namespace Ice::Instrumentation; using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(OutgoingConnectionFactory* p) { return p; } + +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(IncomingConnectionFactory* p) { return p; } +#endif namespace { @@ -57,6 +60,38 @@ struct RandomNumberGenerator : public std::unary_function } }; +#ifdef ICE_CPP11_MAPPING +template void +remove(Map& m, const typename Map::key_type& k, const typename Map::mapped_type& v) +{ + auto pr = m.equal_range(k); + assert(pr.first != pr.second); + for(auto q = pr.first; q != pr.second; ++q) + { + if(q->second.get() == v.get()) + { + m.erase(q); + return; + } + } + assert(false); // Nothing was removed which is an error. +} + +template typename Map::mapped_type +find(const Map& m, const typename Map::key_type& k, function predicate) +{ + auto pr = m.equal_range(k); + for(auto q = pr.first; q != pr.second; ++q) + { + if(predicate(q->second)) + { + return q->second; + } + } + return nullptr; +} + +#else template void remove(multimap& m, K k, V v) { @@ -89,6 +124,7 @@ find(const multimap >& m, } return IceInternal::Handle(); } +#endif } @@ -198,7 +234,11 @@ IceInternal::OutgoingConnectionFactory::create(const vector& endpt return; } +#ifdef ICE_CPP11_MAPPING + auto cb = make_shared(_instance, this, endpoints, hasMore, callback, selType); +#else ConnectCallbackPtr cb = new ConnectCallback(_instance, this, endpoints, hasMore, callback, selType); +#endif cb->getConnectors(); } @@ -545,8 +585,8 @@ IceInternal::OutgoingConnectionFactory::createConnection(const TransceiverPtr& t throw Ice::CommunicatorDestroyedException(__FILE__, __LINE__); } - connection = new ConnectionI(_communicator, _instance, _monitor, transceiver, ci.connector, - ci.endpoint->compress(false), 0); + connection = ConnectionI::create(_communicator, _instance, _monitor, transceiver, ci.connector, + ci.endpoint->compress(false), ICE_NULLPTR); } catch(const Ice::LocalException&) { @@ -827,7 +867,12 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartComplete } connection->activate(); +#ifdef ICE_CPP11_MAPPING + _factory->finishGetConnection(_connectors, *_iter, connection, + dynamic_pointer_cast(shared_from_this())); +#else _factory->finishGetConnection(_connectors, *_iter, connection, this); +#endif } void @@ -845,7 +890,11 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailed(c _factory->handleConnectionException(ex, _hasMore || _iter != _connectors.end() - 1); if(dynamic_cast(&ex)) // No need to continue. { +#ifdef ICE_CPP11_MAPPING + _factory->finishGetConnection(_connectors, ex, dynamic_pointer_cast(shared_from_this())); +#else _factory->finishGetConnection(_connectors, ex, this); +#endif } else if(++_iter != _connectors.end()) // Try the next connector. { @@ -853,7 +902,11 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailed(c } else { +#ifdef ICE_CPP11_MAPPING + _factory->finishGetConnection(_connectors, ex, dynamic_pointer_cast(shared_from_this())); +#else _factory->finishGetConnection(_connectors, ex, this); +#endif } } @@ -936,7 +989,8 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextEndpoint() try { assert(_endpointsIter != _endpoints.end()); - (*_endpointsIter)->connectors_async(_selType, this); + (*_endpointsIter)->connectors_async(_selType, ICE_SHARED_FROM_THIS); + } catch(const Ice::LocalException& ex) { @@ -954,7 +1008,14 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::getConnection() // connection. // bool compress; +#ifdef ICE_CPP11_MAPPING + Ice::ConnectionIPtr connection = _factory->getConnection( + _connectors, + dynamic_pointer_cast(shared_from_this()), + compress); +#else Ice::ConnectionIPtr connection = _factory->getConnection(_connectors, this, compress); +#endif if(!connection) { // @@ -982,7 +1043,6 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector() Ice::ConnectionIPtr connection; try { - const CommunicatorObserverPtr& obsv = _factory->_instance->initializationData().observer; if(obsv) { @@ -1002,7 +1062,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector() << _iter->connector->toString(); } connection = _factory->createConnection(_iter->connector->connect(), *_iter); - connection->start(this); + connection->start(ICE_SHARED_FROM_THIS); } catch(const Ice::LocalException& ex) { @@ -1062,7 +1122,11 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::removeConnectors(const void IceInternal::OutgoingConnectionFactory::ConnectCallback::removeFromPending() { +#ifdef ICE_CPP11_MAPPING + _factory->removeFromPending(dynamic_pointer_cast(shared_from_this()), _connectors); +#else _factory->removeFromPending(this, _connectors); +#endif } bool @@ -1345,8 +1409,8 @@ IceInternal::IncomingConnectionFactory::message(ThreadPoolCurrent& current) try { - connection = new ConnectionI(_adapter->getCommunicator(), _instance, _monitor, transceiver, 0, _endpoint, - _adapter); + connection = ConnectionI::create(_adapter->getCommunicator(), _instance, _monitor, transceiver, 0, + _endpoint, _adapter); } catch(const LocalException& ex) { @@ -1371,7 +1435,11 @@ IceInternal::IncomingConnectionFactory::message(ThreadPoolCurrent& current) } assert(connection); +#ifdef ICE_CPP11_MAPPING + connection->start(dynamic_pointer_cast(shared_from_this())); +#else connection->start(this); +#endif } void @@ -1545,7 +1613,6 @@ IceInternal::IncomingConnectionFactory::initialize() { _endpoint = _endpoint->compress(_instance->defaultsAndOverrides()->overrideCompressValue); } - try { const_cast(_transceiver) = _endpoint->transceiver(); @@ -1557,9 +1624,8 @@ IceInternal::IncomingConnectionFactory::initialize() out << "attempting to bind to " << _endpoint->protocol() << " socket\n" << _transceiver->toString(); } const_cast(_endpoint) = _transceiver->bind(); - - ConnectionIPtr connection = new ConnectionI(_adapter->getCommunicator(), _instance, 0, _transceiver, 0, - _endpoint, _adapter); + ConnectionIPtr connection(ConnectionI::create(_adapter->getCommunicator(), _instance, 0, _transceiver, 0, + _endpoint, _adapter)); connection->start(0); _connections.insert(connection); } @@ -1627,7 +1693,12 @@ IceInternal::IncomingConnectionFactory::setState(State state) Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat); out << "accepting " << _endpoint->protocol() << " connections at " << _acceptor->toString(); } +#ifdef ICE_CPP11_MAPPING + _adapter->getThreadPool()->_register(dynamic_pointer_cast(shared_from_this()), + SocketOperationRead); +#else _adapter->getThreadPool()->_register(this, SocketOperationRead); +#endif } for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::activate)); break; @@ -1646,7 +1717,12 @@ IceInternal::IncomingConnectionFactory::setState(State state) Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat); out << "holding " << _endpoint->protocol() << " connections at " << _acceptor->toString(); } +#ifdef ICE_CPP11_MAPPING + _adapter->getThreadPool()->unregister(dynamic_pointer_cast(shared_from_this()), + SocketOperationRead); +#else _adapter->getThreadPool()->unregister(this, SocketOperationRead); +#endif } for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::hold)); break; @@ -1663,7 +1739,11 @@ IceInternal::IncomingConnectionFactory::setState(State state) // the finish() call. Not all selector implementations do support this // however. // +#ifdef ICE_CPP11_MAPPING + if(_adapter->getThreadPool()->finish(dynamic_pointer_cast(shared_from_this()), true)) +#else if(_adapter->getThreadPool()->finish(this, true)) +#endif { closeAcceptor(); } @@ -1696,7 +1776,6 @@ IceInternal::IncomingConnectionFactory::createAcceptor() { _acceptor = _endpoint->acceptor(_adapter->getName()); assert(_acceptor); - if(_instance->traceLevels()->network >= 2) { Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat); @@ -1704,18 +1783,25 @@ IceInternal::IncomingConnectionFactory::createAcceptor() } _endpoint = _acceptor->listen(); - if(_instance->traceLevels()->network >= 1) { Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat); out << "listening for " << _endpoint->protocol() << " connections\n" << _acceptor->toDetailedString(); } +#ifdef ICE_CPP11_MAPPING + _adapter->getThreadPool()->initialize(dynamic_pointer_cast(shared_from_this())); +#else _adapter->getThreadPool()->initialize(this); - +#endif if(_state == StateActive) { +#ifdef ICE_CPP11_MAPPING + _adapter->getThreadPool()->_register(dynamic_pointer_cast(shared_from_this()), + SocketOperationRead); +#else _adapter->getThreadPool()->_register(this, SocketOperationRead); +#endif } } catch(const Ice::Exception&) diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index bf211972ec8..433d5dbafe2 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -36,7 +37,7 @@ namespace Ice class LocalException; class ObjectAdapterI; -typedef IceUtil::Handle ObjectAdapterIPtr; +ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI); } @@ -68,11 +69,11 @@ public: void removeAdapter(const Ice::ObjectAdapterPtr&); void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&); -private: - OutgoingConnectionFactory(const Ice::CommunicatorPtr&, const InstancePtr&); virtual ~OutgoingConnectionFactory(); friend class Instance; + +private: struct ConnectorInfo { @@ -86,7 +87,11 @@ private: EndpointIPtr endpoint; }; - class ConnectCallback : public Ice::ConnectionI::StartCallback, public IceInternal::EndpointI_connectors + class ConnectCallback : public Ice::ConnectionI::StartCallback, + public IceInternal::EndpointI_connectors +#ifdef ICE_CPP11_MAPPING + , public ::std::enable_shared_from_this<::IceInternal::OutgoingConnectionFactory::ConnectCallback> +#endif { public: @@ -127,7 +132,7 @@ private: std::vector _connectors; std::vector::const_iterator _iter; }; - typedef IceUtil::Handle ConnectCallbackPtr; + ICE_DEFINE_PTR(ConnectCallbackPtr, ConnectCallback); friend class ConnectCallback; std::vector applyOverrides(const std::vector&); @@ -156,7 +161,11 @@ private: std::multimap _connections; std::map > _pending; +#ifdef ICE_CPP11_MAPPING + std::multimap> _connectionsByEndpoint; +#else std::multimap _connectionsByEndpoint; +#endif int _pendingConnectCount; }; @@ -201,11 +210,12 @@ public: virtual void connectionStartCompleted(const Ice::ConnectionIPtr&); virtual void connectionStartFailed(const Ice::ConnectionIPtr&, const Ice::LocalException&); -private: - IncomingConnectionFactory(const InstancePtr&, const EndpointIPtr&, const Ice::ObjectAdapterIPtr&); void initialize(); virtual ~IncomingConnectionFactory(); + +private: + friend class Ice::ObjectAdapterI; enum State diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 4a078bcc1f8..a824fbf0107 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -38,7 +38,9 @@ using namespace Ice; using namespace Ice::Instrumentation; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; } +#endif namespace { @@ -353,7 +355,12 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback) exception(ex); if(callback) { +#ifdef ICE_CPP11_MAPPING + callback->connectionStartFailed(dynamic_pointer_cast(shared_from_this()), + *_exception.get()); +#else callback->connectionStartFailed(this, *_exception.get()); +#endif return; } else @@ -365,7 +372,11 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback) if(callback) { +#ifdef ICE_CPP11_MAPPING + callback->connectionStartCompleted(dynamic_pointer_cast(shared_from_this())); +#else callback->connectionStartCompleted(this); +#endif } } @@ -725,8 +736,11 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compres // Notify the request that it's cancelable with this connection. // This will throw if the request is canceled. // +#ifdef ICE_CPP11_MAPPING + out->cancelable(dynamic_pointer_cast(shared_from_this())); +#else out->cancelable(this); - +#endif Int requestId = 0; if(response) { @@ -799,6 +813,81 @@ Ice::ConnectionI::flushBatchRequests() out.invoke(); } +#ifdef ICE_CPP11_MAPPING +function +Ice::ConnectionI::flushBatchRequests_async(function, function exception, + function sent) +{ + class FlushBatchRequestsCallback : public CallbackBase + { + public: + + FlushBatchRequestsCallback(function exception, + function sent, + shared_ptr connection) : + _exception(move(exception)), + _sent(move(sent)), + _connection(move(connection)) + { + } + + virtual void sent(const AsyncResultPtr& result) const + { + try + { + AsyncResult::__check(result, _connection.get(), __flushBatchRequests_name); + result->__wait(); + } + catch(const ::Ice::Exception&) + { + _exception(current_exception()); + } + + if(_sent) + { + _sent(result->sentSynchronously()); + } + } + + virtual bool hasSentCallback() const + { + return true; + } + + + virtual void + completed(const ::Ice::AsyncResultPtr& result) const + { + try + { + AsyncResult::__check(result, _connection.get(), __flushBatchRequests_name); + result->__wait(); + } + catch(const ::Ice::Exception&) + { + _exception(current_exception()); + } + } + + private: + + function _exception; + function _sent; + shared_ptr _connection; + }; + + auto self = dynamic_pointer_cast(shared_from_this()); + + auto result = make_shared(self, _communicator, _instance, __flushBatchRequests_name, + make_shared(move(exception), move(sent), self)); + result->invoke(); + return [result]() + { + result->cancel(); + }; +} +#else + AsyncResultPtr Ice::ConnectionI::begin_flushBatchRequests() { @@ -822,7 +911,7 @@ AsyncResultPtr Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function& exception, const IceInternal::Function& sent) { -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER class Cpp11CB : public IceInternal::Cpp11FnCallbackNC { public: @@ -851,7 +940,7 @@ Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function(shared_from_this()), +#else + this, +#endif + _communicator, + _instance, + __flushBatchRequests_name, + cb, + cookie); result->invoke(); return result; } @@ -877,6 +971,7 @@ Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r) AsyncResult::__check(r, this, __flushBatchRequests_name); r->__wait(); } +#endif void Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback) @@ -907,7 +1002,11 @@ Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback) const ConnectionIPtr _connection; const ConnectionCallbackPtr _callback; }; +#ifdef ICE_CPP11_MAPPING + _threadPool->dispatch(new CallbackWorkItem(dynamic_pointer_cast(shared_from_this()), callback)); +#else _threadPool->dispatch(new CallbackWorkItem(this, callback)); +#endif } } else @@ -922,7 +1021,11 @@ Ice::ConnectionI::closeCallback(const ConnectionCallbackPtr& callback) { try { +#ifdef ICE_CPP11_MAPPING + callback->closed(dynamic_pointer_cast(shared_from_this())); +#else callback->closed(this); +#endif } catch(const std::exception& ex) { @@ -949,7 +1052,11 @@ Ice::ConnectionI::setACM(const IceUtil::Optional& timeout, if(_state == StateActive) { +#ifdef ICE_CPP11_MAPPING + _monitor->remove(dynamic_pointer_cast(shared_from_this())); +#else _monitor->remove(this); +#endif } _monitor = _monitor->acm(timeout, close, heartbeat); @@ -964,7 +1071,11 @@ Ice::ConnectionI::setACM(const IceUtil::Optional& timeout, if(_state == StateActive) { +#ifdef ICE_CPP11_MAPPING + _monitor->add(dynamic_pointer_cast(shared_from_this())); +#else _monitor->add(this); +#endif } } @@ -1089,7 +1200,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con if(o->requestId) { if(_asyncRequestsHint != _asyncRequests.end() && - _asyncRequestsHint->second == OutgoingAsyncPtr::dynamicCast(outAsync)) + _asyncRequestsHint->second == ICE_DYNAMIC_CAST(OutgoingAsync, outAsync)) { _asyncRequests.erase(_asyncRequestsHint); _asyncRequestsHint = _asyncRequests.end(); @@ -1128,7 +1239,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con } } - if(OutgoingAsyncPtr::dynamicCast(outAsync)) + if(ICE_DYNAMIC_CAST(OutgoingAsync, outAsync)) { if(_asyncRequestsHint != _asyncRequests.end()) { @@ -1335,14 +1446,19 @@ Ice::ConnectionI::getEndpoint() const return _endpoint; // No mutex protection necessary, _endpoint is immutable. } -ObjectPrx +ObjectPrxPtr Ice::ConnectionI::createProxy(const Identity& ident) const { // // Create a reference and return a reverse proxy for this // reference. // - ConnectionIPtr self = const_cast(this); + ConnectionIPtr self = +#ifdef ICE_CPP11_MAPPING + dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else + const_cast(this); +#endif return _instance->proxyFactory()->referenceToProxy(_instance->referenceFactory()->create(ident, self)); } @@ -1461,7 +1577,6 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) int dispatchCount = 0; ThreadPoolMessage msg(current, *this); - { IceUtil::Monitor::Lock sync(*this); @@ -1593,7 +1708,12 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) // satisfied before continuing. // scheduleTimeout(newOp); +#ifdef ICE_CPP11_MAPPING + _threadPool->update(dynamic_pointer_cast(shared_from_this()), + current.operation, newOp); +#else _threadPool->update(this, current.operation, newOp); +#endif return; } @@ -1607,7 +1727,12 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) return; } +#ifdef ICE_CPP11_MAPPING + _threadPool->unregister(dynamic_pointer_cast(shared_from_this()), + current.operation); +#else _threadPool->unregister(this, current.operation); +#endif // // We start out in holding state. @@ -1655,7 +1780,12 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) if(_state < StateClosed) { scheduleTimeout(newOp); +#ifdef ICE_CPP11_MAPPING + _threadPool->update(dynamic_pointer_cast(shared_from_this()), current.operation, + newOp); +#else _threadPool->update(this, current.operation, newOp); +#endif } } @@ -1717,9 +1847,15 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) } else { - _threadPool->dispatchFromThisThread(new DispatchCall(this, startCB, sentCBs, compress, requestId, invokeNum, - servantManager, adapter, outAsync, heartbeatCallback, - current.stream)); +#ifdef ICE_CPP11_MAPPING + _threadPool->dispatchFromThisThread(new DispatchCall(dynamic_pointer_cast(shared_from_this()), + startCB, sentCBs, compress, requestId, invokeNum, servantManager, adapter, outAsync, heartbeatCallback, + current.stream)); +#else + _threadPool->dispatchFromThisThread(new DispatchCall(this, startCB, sentCBs, compress, requestId, + invokeNum, servantManager, adapter, outAsync, heartbeatCallback, current.stream)); +#endif + } } @@ -1737,7 +1873,12 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vectorconnectionStartCompleted(dynamic_pointer_cast(shared_from_this())); +#else startCB->connectionStartCompleted(this); +#endif ++dispatchedCount; } @@ -1755,7 +1896,7 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vectorreceivedReply) { - OutgoingAsyncPtr outAsync = OutgoingAsyncPtr::dynamicCast(p->outAsync); + OutgoingAsyncPtr outAsync = ICE_DYNAMIC_CAST(OutgoingAsync, p->outAsync); if(outAsync->completed()) { outAsync->invokeCompleted(); @@ -1782,7 +1923,11 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vectorheartbeat(dynamic_pointer_cast(shared_from_this())); +#else heartbeatCallback->heartbeat(this); +#endif } catch(const std::exception& ex) { @@ -1874,7 +2019,12 @@ Ice::ConnectionI::finished(ThreadPoolCurrent& current, bool close) } else { +#ifdef ICE_CPP11_MAPPING + _threadPool->dispatchFromThisThread(new FinishCall( + dynamic_pointer_cast(shared_from_this()), close)); +#else _threadPool->dispatchFromThisThread(new FinishCall(this, close)); +#endif } } @@ -1919,7 +2069,12 @@ Ice::ConnectionI::finish(bool close) if(_startCallback) { +#ifdef ICE_CPP11_MAPPING + _startCallback->connectionStartFailed( + dynamic_pointer_cast(shared_from_this()), *_exception.get()); +#else _startCallback->connectionStartFailed(this, *_exception.get()); +#endif _startCallback = 0; } @@ -1948,7 +2103,7 @@ Ice::ConnectionI::finish(bool close) } if(message->receivedReply) { - OutgoingAsyncPtr outAsync = OutgoingAsyncPtr::dynamicCast(message->outAsync); + OutgoingAsyncPtr outAsync = ICE_DYNAMIC_CAST(OutgoingAsync, message->outAsync); if(outAsync->completed()) { outAsync->invokeCompleted(); @@ -2156,26 +2311,29 @@ Ice::ConnectionI::ConnectionI(const CommunicatorPtr& communicator, { _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic); } +} - __setNoDelete(true); - try +Ice::ConnectionIPtr +Ice::ConnectionI::create(const CommunicatorPtr& communicator, + const InstancePtr& instance, + const ACMMonitorPtr& monitor, + const TransceiverPtr& transceiver, + const ConnectorPtr& connector, + const EndpointIPtr& endpoint, + const ObjectAdapterIPtr& adapter) +{ + Ice::ConnectionIPtr conn(new ConnectionI(communicator, instance, monitor, transceiver, connector, + endpoint, adapter)); + if(adapter) { - if(adapter) - { - const_cast(_threadPool) = adapter->getThreadPool(); - } - else - { - const_cast(_threadPool) = _instance->clientThreadPool(); - } - _threadPool->initialize(this); + const_cast(conn->_threadPool) = adapter->getThreadPool(); } - catch(const IceUtil::Exception&) + else { - __setNoDelete(false); - throw; + const_cast(conn->_threadPool) = conn->_instance->clientThreadPool(); } - __setNoDelete(false); + conn->_threadPool->initialize(conn); + return conn; } Ice::ConnectionI::~ConnectionI() @@ -2296,7 +2454,12 @@ Ice::ConnectionI::setState(State state) { return; } +#ifdef ICE_CPP11_MAPPING + _threadPool->_register(dynamic_pointer_cast(shared_from_this()), + SocketOperationRead); +#else _threadPool->_register(this, SocketOperationRead); +#endif break; } @@ -2312,7 +2475,12 @@ Ice::ConnectionI::setState(State state) } if(_state == StateActive) { +#ifdef ICE_CPP11_MAPPING + _threadPool->unregister(dynamic_pointer_cast(shared_from_this()), + SocketOperationRead); +#else _threadPool->unregister(this, SocketOperationRead); +#endif } break; } @@ -2343,7 +2511,11 @@ Ice::ConnectionI::setState(State state) // Don't need to close now for connections so only close the transceiver // if the selector request it. // +#ifdef ICE_CPP11_MAPPING + if(_threadPool->finish(dynamic_pointer_cast(shared_from_this()), false)) +#else if(_threadPool->finish(this, false)) +#endif { _transceiver->close(); } @@ -2378,11 +2550,19 @@ Ice::ConnectionI::setState(State state) { _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic); } +#ifdef ICE_CPP11_MAPPING + _monitor->add(dynamic_pointer_cast(shared_from_this())); +#else _monitor->add(this); +#endif } else if(_state == StateActive) { +#ifdef ICE_CPP11_MAPPING + _monitor->remove(dynamic_pointer_cast(shared_from_this())); +#else _monitor->remove(this); +#endif } } @@ -2467,7 +2647,11 @@ Ice::ConnectionI::initiateShutdown() if(op) { scheduleTimeout(op); +#ifdef ICE_CPP11_MAPPING + _threadPool->_register(dynamic_pointer_cast(shared_from_this()), op); +#else _threadPool->_register(this, op); +#endif } } } @@ -2511,7 +2695,11 @@ Ice::ConnectionI::initialize(SocketOperation operation) if(s != SocketOperationNone) { scheduleTimeout(s); +#ifdef ICE_CPP11_MAPPING + _threadPool->update(dynamic_pointer_cast(shared_from_this()), operation, s); +#else _threadPool->update(this, operation, s); +#endif return false; } @@ -2557,7 +2745,11 @@ Ice::ConnectionI::validate(SocketOperation operation) if(op) { scheduleTimeout(op); +#ifdef ICE_CPP11_MAPPING + _threadPool->update(dynamic_pointer_cast(shared_from_this()), operation, op); +#else _threadPool->update(this, operation, op); +#endif return false; } } @@ -2586,7 +2778,11 @@ Ice::ConnectionI::validate(SocketOperation operation) if(op) { scheduleTimeout(op); +#ifdef ICE_CPP11_MAPPING + _threadPool->update(dynamic_pointer_cast(shared_from_this()), operation, op); +#else _threadPool->update(this, operation, op); +#endif return false; } } @@ -2964,7 +3160,11 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message) _writeStream.swap(*_sendStreams.back().stream); scheduleTimeout(op); +#ifdef ICE_CPP11_MAPPING + _threadPool->_register(dynamic_pointer_cast(shared_from_this()), op); +#else _threadPool->_register(this, op); +#endif return AsyncStatusQueued; } @@ -3520,7 +3720,7 @@ Ice::ConnectionI::initConnectionInfo() const } catch(const Ice::LocalException&) { - _info = new ConnectionInfo(); + _info = ICE_MAKE_SHARED(ConnectionInfo); } _info->connectionId = _endpoint->connectionId(); _info->incoming = _connector == 0; @@ -3579,7 +3779,11 @@ ConnectionI::reap() { if(_monitor) { +#ifdef ICE_CPP11_MAPPING + _monitor->reap(dynamic_pointer_cast(shared_from_this())); +#else _monitor->reap(this); +#endif } if(_observer) { diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index fdb80901122..c3b4c270311 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -60,7 +60,7 @@ namespace Ice class LocalException; class ObjectAdapterI; -typedef IceUtil::Handle ObjectAdapterIPtr; +ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI); class ConnectionI : public Connection, public IceInternal::EventHandler, @@ -134,6 +134,17 @@ public: #endif }; + +#ifdef ICE_CPP11_MAPPING + class StartCallback + { + public: + + virtual void connectionStartCompleted(const ConnectionIPtr&) = 0; + virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0; + }; + typedef ::std::shared_ptr StartCallbackPtr; +#else class StartCallback : virtual public IceUtil::Shared { public: @@ -142,7 +153,8 @@ public: virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0; }; typedef IceUtil::Handle StartCallbackPtr; - +#endif + enum DestructionReason { ObjectAdapterDeactivated, @@ -174,16 +186,22 @@ public: virtual void flushBatchRequests(); // From Connection. +#ifdef ICE_CPP11_MAPPING + virtual std::function + flushBatchRequests_async(::std::function completed, + ::std::function exception = nullptr, + ::std::function sent = nullptr); +#else virtual AsyncResultPtr begin_flushBatchRequests(); virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0); virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Connection_flushBatchRequestsPtr&, const LocalObjectPtr& = 0); - virtual AsyncResultPtr begin_flushBatchRequests( const ::IceInternal::Function&, const ::IceInternal::Function& = ::IceInternal::Function()); virtual void end_flushBatchRequests(const AsyncResultPtr&); +#endif virtual void setCallback(const ConnectionCallbackPtr&); virtual void setACM(const IceUtil::Optional&, @@ -205,7 +223,7 @@ public: virtual void setAdapter(const ObjectAdapterPtr&); // From Connection. virtual ObjectAdapterPtr getAdapter() const; // From Connection. virtual EndpointPtr getEndpoint() const; // From Connection. - virtual ObjectPrx createProxy(const Identity& ident) const; // From Connection. + virtual ObjectPrxPtr createProxy(const Identity& ident) const; // From Connection. // // Operations from EventHandler @@ -238,8 +256,20 @@ public: void closeCallback(const ConnectionCallbackPtr&); + + virtual ~ConnectionI(); + private: + ConnectionI(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&, + const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&, + const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&); + + static ConnectionIPtr + create(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&, + const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&, + const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&); + enum State { StateNotInitialized, @@ -252,11 +282,6 @@ private: StateFinished }; - ConnectionI(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&, - const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&, - const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&); - virtual ~ConnectionI(); - friend class IceInternal::IncomingConnectionFactory; friend class IceInternal::OutgoingConnectionFactory; diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp index cab544915e6..62bcebb111c 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.cpp +++ b/cpp/src/Ice/ConnectionRequestHandler.cpp @@ -51,7 +51,7 @@ ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const { // Ignore. } - return this; + return ICE_SHARED_FROM_THIS; } bool diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h index cef3df68f4d..29f70063768 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.h +++ b/cpp/src/Ice/ConnectionRequestHandler.h @@ -17,7 +17,8 @@ namespace IceInternal { -class ConnectionRequestHandler : public RequestHandler +class ConnectionRequestHandler : public RequestHandler, + public ICE_ENABLE_SHARED_FROM_THIS(ConnectionRequestHandler) { public: diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index aaf5a101e67..fc13d9188d7 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -89,7 +89,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc if(comma == string::npos) { libName = libSpec; -# if defined(ICE_CPP11) && defined(__GLIBCXX__) +# if defined(ICE_CPP11_COMPILER) && defined(__GLIBCXX__) libName += "++11"; # endif if(useIceVersion) @@ -119,7 +119,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc return 0; } libName = libSpec.substr(0, comma); -# if defined(ICE_CPP11) && defined(__GLIBCXX__) +# if defined(ICE_CPP11_COMPILER) && defined(__GLIBCXX__) libName += "++11"; # endif version = libSpec.substr(comma + 1); diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp index 25487819338..6830eda8521 100644 --- a/cpp/src/Ice/EndpointFactoryManager.cpp +++ b/cpp/src/Ice/EndpointFactoryManager.cpp @@ -140,7 +140,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint) // if(protocol == "opaque") { - EndpointIPtr ue = new OpaqueEndpointI(v); + EndpointIPtr ue = ICE_MAKE_SHARED(OpaqueEndpointI, v); if(!v.empty()) { EndpointParseException ex(__FILE__, __LINE__); @@ -189,7 +189,7 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const } else { - e = new OpaqueEndpointI(type, s); + e = ICE_MAKE_SHARED(OpaqueEndpointI, type, s); } s->endReadEncaps(); diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index bb967ab0e26..073b9049549 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -11,8 +11,10 @@ using namespace std; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; } IceUtil::Shared* IceInternal::upCast(EndpointI_connectors* p) { return p; } +#endif string IceInternal::EndpointI::toString() const diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index df41372bd82..6000f706bdb 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -22,7 +22,10 @@ namespace IceInternal class BasicStream; -class ICE_API EndpointI_connectors : public virtual IceUtil::Shared +class ICE_API EndpointI_connectors +#ifndef ICE_CPP11_MAPPING + : public virtual IceUtil::Shared +#endif { public: @@ -32,7 +35,8 @@ public: virtual void exception(const Ice::LocalException&) = 0; }; -class ICE_API EndpointI : public Ice::Endpoint +class ICE_API EndpointI : public Ice::Endpoint, + public ICE_ENABLE_SHARED_FROM_THIS(EndpointI) { public: @@ -131,8 +135,13 @@ public: // // Compare endpoints for sorting purposes. // +#ifdef ICE_CPP11_MAPPING + virtual bool operator==(const EndpointI&) const = 0; + virtual bool operator<(const EndpointI&) const = 0; +#else virtual bool operator==(const Ice::LocalObject&) const = 0; virtual bool operator<(const Ice::LocalObject&) const = 0; +#endif virtual ::Ice::Int hash() const = 0; @@ -150,6 +159,7 @@ protected: }; +#ifndef ICE_CPP11_MAPPING inline bool operator==(const EndpointI& l, const EndpointI& r) { return static_cast(l) == static_cast(r); @@ -159,6 +169,7 @@ inline bool operator<(const EndpointI& l, const EndpointI& r) { return static_cast(l) < static_cast(r); } +#endif template class InfoI : public T { diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h index b851a8871b9..47959d98c28 100644 --- a/cpp/src/Ice/EndpointIF.h +++ b/cpp/src/Ice/EndpointIF.h @@ -17,25 +17,38 @@ namespace IceInternal { class EndpointI; +class TcpEndpointI; +class UdpEndpointI; +class WSEndpoint; +class EndpointI_connectors; + +#ifdef ICE_CPP11_MAPPING // C++11 mapping + +typedef ::std::shared_ptr EndpointIPtr; +typedef ::std::shared_ptr TcpEndpointIPtr; +typedef ::std::shared_ptr UdpEndpointIPtr; +typedef ::std::shared_ptr WSEndpointPtr; +typedef ::std::shared_ptr EndpointI_connectorsPtr; + +#else // C++98 mapping + ICE_API IceUtil::Shared* upCast(EndpointI*); typedef Handle EndpointIPtr; -class TcpEndpointI; ICE_API IceUtil::Shared* upCast(TcpEndpointI*); typedef Handle TcpEndpointIPtr; -class UdpEndpointI; ICE_API IceUtil::Shared* upCast(UdpEndpointI*); typedef Handle UdpEndpointIPtr; -class WSEndpoint; ICE_API IceUtil::Shared* upCast(WSEndpoint*); typedef Handle WSEndpointPtr; -class EndpointI_connectors; ICE_API IceUtil::Shared* upCast(EndpointI_connectors*); typedef Handle EndpointI_connectorsPtr; +#endif + } #endif diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp index 6edea2d9307..ffa7f218c92 100644 --- a/cpp/src/Ice/EventHandler.cpp +++ b/cpp/src/Ice/EventHandler.cpp @@ -14,7 +14,9 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; } +#endif IceInternal::EventHandler::EventHandler() : #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index a47a1899d10..47e4473ca1b 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -16,11 +16,17 @@ #include #include #include +#include namespace IceInternal { -class ICE_API EventHandler : virtual public ::Ice::LocalObject +class ICE_API EventHandler : +#ifdef ICE_CPP11_MAPPING + virtual public VirtualShared +#else + virtual public ::Ice::LocalObject +#endif { public: diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h index e627e964c4d..878651e40db 100644 --- a/cpp/src/Ice/EventHandlerF.h +++ b/cpp/src/Ice/EventHandlerF.h @@ -18,9 +18,12 @@ namespace IceInternal { class EventHandler; +#ifdef ICE_CPP11_MAPPING +typedef ::std::shared_ptr EventHandlerPtr; +#else ICE_API IceUtil::Shared* upCast(EventHandler*); typedef Handle EventHandlerPtr; - +#endif } #endif diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 7efe9309ee9..d23255ef4ab 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -66,7 +66,7 @@ namespace Ex { void -throwUOE(const string& expectedType, const ObjectPtr& v) +throwUOE(const string& expectedType, const ValuePtr& v) { // // If the object is an unknown sliced object, we didn't find an diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp index aae6142bb3d..bc48ab8d6e9 100644 --- a/cpp/src/Ice/FactoryTable.cpp +++ b/cpp/src/Ice/FactoryTable.cpp @@ -10,12 +10,14 @@ #include #include +using namespace std; + // // Add a factory to the exception factory table. // If the factory is present already, increment its reference count. // void -IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceInternal::UserExceptionFactoryPtr& f) +IceInternal::FactoryTable::addExceptionFactory(const string& t, const IceInternal::UserExceptionFactoryPtr& f) { IceUtil::Mutex::Lock lock(_m); assert(f); @@ -34,7 +36,7 @@ IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceIn // Return the exception factory for a given type ID // IceInternal::UserExceptionFactoryPtr -IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const +IceInternal::FactoryTable::getExceptionFactory(const string& t) const { IceUtil::Mutex::Lock lock(_m); EFTable::const_iterator i = _eft.find(t); @@ -48,7 +50,7 @@ IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const // entry from the table. // void -IceInternal::FactoryTable::removeExceptionFactory(const std::string& t) +IceInternal::FactoryTable::removeExceptionFactory(const string& t) { IceUtil::Mutex::Lock lock(_m); EFTable::iterator i = _eft.find(t); @@ -64,8 +66,13 @@ IceInternal::FactoryTable::removeExceptionFactory(const std::string& t) // // Add a factory to the object factory table. // +#ifdef ICE_CPP11_MAPPING +void +IceInternal::FactoryTable::addObjectFactory(const string& t, function<::Ice::ValuePtr (const string&)> f) +#else void -IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::ObjectFactoryPtr& f) +IceInternal::FactoryTable::addObjectFactory(const string& t, const ::Ice::ObjectFactoryPtr& f) +#endif { IceUtil::Mutex::Lock lock(_m); assert(f); @@ -83,13 +90,23 @@ IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::Obj // // Return the object factory for a given type ID // +#ifdef ICE_CPP11_MAPPING +function +IceInternal::FactoryTable::getObjectFactory(const string& t) const +{ + IceUtil::Mutex::Lock lock(_m); + OFTable::const_iterator i = _oft.find(t); + return i != _oft.end() ? i->second.first : nullptr; +} +#else Ice::ObjectFactoryPtr -IceInternal::FactoryTable::getObjectFactory(const std::string& t) const +IceInternal::FactoryTable::getObjectFactory(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(); } +#endif // // Remove a factory from the object factory table. If the factory @@ -98,7 +115,7 @@ IceInternal::FactoryTable::getObjectFactory(const std::string& t) const // entry from the table. // void -IceInternal::FactoryTable::removeObjectFactory(const std::string& t) +IceInternal::FactoryTable::removeObjectFactory(const string& t) { IceUtil::Mutex::Lock lock(_m); OFTable::iterator i = _oft.find(t); @@ -115,7 +132,7 @@ IceInternal::FactoryTable::removeObjectFactory(const std::string& t) // Add a factory to the object factory table. // void -IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId) +IceInternal::FactoryTable::addTypeId(int compactId, const string& typeId) { IceUtil::Mutex::Lock lock(_m); assert(!typeId.empty() && compactId >= 0); @@ -133,12 +150,12 @@ IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId) // // Return the type ID for the given compact ID // -std::string +string IceInternal::FactoryTable::getTypeId(int compactId) const { IceUtil::Mutex::Lock lock(_m); TypeIdTable::const_iterator i = _typeIdTable.find(compactId); - return i != _typeIdTable.end() ? i->second.first : std::string(); + return i != _typeIdTable.end() ? i->second.first : string(); } void diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp index 303116f8679..f5101ded9c9 100644 --- a/cpp/src/Ice/GCObject.cpp +++ b/cpp/src/Ice/GCObject.cpp @@ -9,6 +9,8 @@ #include +#ifndef ICE_CPP11_MAPPING + #include #include @@ -442,3 +444,4 @@ GCObject::collect(IceUtilInternal::MutexPtrLock& lock) } return true; } +#endif diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index 49c17dba4ad..74d274d8d77 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -46,7 +46,9 @@ Init init; } +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(IPEndpointI* p) { return p; } +#endif IceUtil::Shared* IceInternal::upCast(EndpointHostResolver* p) { return p; } IceInternal::IPEndpointInfoI::IPEndpointInfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint) @@ -78,7 +80,13 @@ IceInternal::IPEndpointInfoI::secure() const Ice::EndpointInfoPtr IceInternal::IPEndpointI::getInfo() const { - Ice::IPEndpointInfoPtr info = new IPEndpointInfoI(const_cast(this)); + Ice::IPEndpointInfoPtr info +#ifdef ICE_CPP11_MAPPING + = make_shared( + dynamic_pointer_cast(const_pointer_cast(shared_from_this()))); +#else + = new IPEndpointInfoI(const_cast(this)); +#endif fillEndpointInfo(info.get()); return info; } @@ -121,7 +129,12 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const { if(connectionId == _connectionId) { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast( + const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } else { @@ -144,7 +157,13 @@ IceInternal::IPEndpointI::port() const void IceInternal::IPEndpointI::connectors_async(Ice::EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const { - _instance->resolve(_host, _port, selType, const_cast(this), cb); + _instance->resolve(_host, _port, selType, +#ifdef ICE_CPP11_MAPPING + dynamic_pointer_cast(const_pointer_cast(shared_from_this())), +#else + const_cast(this), +#endif + cb); } vector @@ -154,7 +173,13 @@ IceInternal::IPEndpointI::expand() const vector hosts = getHostsForEndpointExpand(_host, _instance->protocolSupport(), false); if(hosts.empty()) { - endps.push_back(const_cast(this)); + endps.push_back( +#ifdef ICE_CPP11_MAPPING + dynamic_pointer_cast(const_pointer_cast(shared_from_this())) +#else + const_cast(this) +#endif + ); } else { @@ -229,7 +254,11 @@ IceInternal::IPEndpointI::options() const } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::IPEndpointI::operator==(const EndpointI& r) const +#else IceInternal::IPEndpointI::operator==(const LocalObject& r) const +#endif { const IPEndpointI* p = dynamic_cast(&r); if(!p) @@ -261,12 +290,15 @@ IceInternal::IPEndpointI::operator==(const LocalObject& r) const { return false; } - return true; } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::IPEndpointI::operator<(const EndpointI& r) const +#else IceInternal::IPEndpointI::operator<(const LocalObject& r) const +#endif { const IPEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h index 91263da5f39..396d25fdad8 100644 --- a/cpp/src/Ice/IPEndpointI.h +++ b/cpp/src/Ice/IPEndpointI.h @@ -62,8 +62,13 @@ public: virtual ::Ice::Int hash() const; virtual std::string options() const; +#ifdef ICE_CPP11_MAPPING + virtual bool operator==(const EndpointI&) const; + virtual bool operator<(const EndpointI&) const; +#else virtual bool operator==(const Ice::LocalObject&) const; virtual bool operator<(const Ice::LocalObject&) const; +#endif virtual std::vector connectors(const std::vector
&, const NetworkProxyPtr&) const; const std::string& host() const; @@ -143,6 +148,7 @@ private: #endif }; +#ifndef ICE_CPP11_MAPPING inline bool operator==(const IPEndpointI& l, const IPEndpointI& r) { return static_cast(l) == static_cast(r); @@ -152,6 +158,7 @@ inline bool operator<(const IPEndpointI& l, const IPEndpointI& r) { return static_cast(l) < static_cast(r); } +#endif } diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h index aec4433cfc5..a092235c26e 100644 --- a/cpp/src/Ice/IPEndpointIF.h +++ b/cpp/src/Ice/IPEndpointIF.h @@ -17,13 +17,17 @@ namespace IceInternal { class IPEndpointI; + +#ifdef ICE_CPP11_MAPPING +typedef ::std::shared_ptr IPEndpointIPtr; +#else ICE_API IceUtil::Shared* upCast(IPEndpointI*); typedef Handle IPEndpointIPtr; +#endif class EndpointHostResolver; ICE_API IceUtil::Shared* upCast(EndpointHostResolver*); typedef Handle EndpointHostResolverPtr; - } #endif diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index 5af15c5eae3..a4d58f9e9b7 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -22,7 +22,7 @@ namespace class SharedImplicitContext : public ImplicitContextI { public: - + virtual Context getContext() const; virtual void setContext(const Context&); @@ -43,7 +43,7 @@ private: class PerThreadImplicitContext : public ImplicitContextI { public: - + PerThreadImplicitContext(); virtual ~PerThreadImplicitContext(); @@ -76,7 +76,7 @@ public: // is assigned a slot in this vector. // typedef std::vector SlotVector; - + // // We remember which slot-indices are in use (to be able to reuse indices) // @@ -90,7 +90,7 @@ public: static DWORD _key; #else static pthread_key_t _key; -#endif +#endif private: @@ -107,7 +107,7 @@ extern "C" void iceImplicitContextThreadDestructor(void*); -/*static*/ ImplicitContextI* +ImplicitContextIPtr ImplicitContextI::create(const std::string& kind) { if(kind == "None" || kind == "") @@ -116,14 +116,14 @@ ImplicitContextI::create(const std::string& kind) } else if(kind == "Shared") { - return new SharedImplicitContext; + return ICE_MAKE_SHARED(SharedImplicitContext); } else if(kind == "PerThread") { #ifndef ICE_OS_WINRT - return new PerThreadImplicitContext; + return ICE_MAKE_SHARED(PerThreadImplicitContext); #else - throw InitializationException(__FILE__, __LINE__, + throw InitializationException(__FILE__, __LINE__, "'PerThread' Ice.ImplicitContext isn't supported for WinRT."); return 0; // Keep the compiler happy. #endif @@ -132,7 +132,7 @@ ImplicitContextI::create(const std::string& kind) { throw Ice::InitializationException( __FILE__, __LINE__, - "'" + kind + "' is not a valid value for Ice.ImplicitContext"); + "'" + kind + "' is not a valid value for Ice.ImplicitContext"); return 0; // Keep the compiler happy. } } @@ -144,7 +144,7 @@ ImplicitContextI::cleanupThread() if(PerThreadImplicitContext::_nextId > 0) { iceImplicitContextThreadDestructor(TlsGetValue(PerThreadImplicitContext::_key)); - } + } } #endif @@ -167,7 +167,7 @@ SharedImplicitContext::setContext(const Context& newContext) _context = newContext; } -bool +bool SharedImplicitContext::containsKey(const string& k) const { IceUtil::Mutex::Lock lock(_mutex); @@ -175,7 +175,7 @@ SharedImplicitContext::containsKey(const string& k) const return p != _context.end(); } -string +string SharedImplicitContext::get(const string& k) const { IceUtil::Mutex::Lock lock(_mutex); @@ -188,12 +188,12 @@ SharedImplicitContext::get(const string& k) const } -string +string SharedImplicitContext::put(const string& k, const string& v) { IceUtil::Mutex::Lock lock(_mutex); string& val = _context[k]; - + string oldVal = val; val = v; return oldVal; @@ -216,7 +216,7 @@ SharedImplicitContext::remove(const string& k) } } -void +void SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const { IceUtil::Mutex::Lock lock(_mutex); @@ -238,7 +238,7 @@ SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream } } -void +void SharedImplicitContext::combine(const Context& proxyCtx, Context& ctx) const { IceUtil::Mutex::Lock lock(_mutex); @@ -318,7 +318,7 @@ PerThreadImplicitContext::PerThreadImplicitContext() } # endif } - + // // Now grabs an index // @@ -444,7 +444,7 @@ PerThreadImplicitContext::clearThreadContext() const size_t i = sv->size(); bool clear = true; - while(i != 0) + while(i != 0) { i--; if((*sv)[i].context != 0) @@ -509,7 +509,7 @@ PerThreadImplicitContext::setContext(const Context& newContext) } } -bool +bool PerThreadImplicitContext::containsKey(const string& k) const { const Context* ctx = getThreadContext(false); @@ -521,7 +521,7 @@ PerThreadImplicitContext::containsKey(const string& k) const return p != ctx->end(); } -string +string PerThreadImplicitContext::get(const string& k) const { const Context* ctx = getThreadContext(false); @@ -537,13 +537,13 @@ PerThreadImplicitContext::get(const string& k) const return p->second; } -string +string PerThreadImplicitContext::put(const string& k, const string& v) { Context* ctx = getThreadContext(true); string& val = (*ctx)[k]; - + string oldVal = val; val = v; return oldVal; @@ -557,7 +557,7 @@ PerThreadImplicitContext::remove(const string& k) { return ""; } - + Context::iterator p = ctx->find(k); if(p == ctx->end()) { @@ -576,7 +576,7 @@ PerThreadImplicitContext::remove(const string& k) } } -void +void PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const { const Context* threadCtx = getThreadContext(false); @@ -597,7 +597,7 @@ PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStr } } -void +void PerThreadImplicitContext::combine(const Context& proxyCtx, Context& ctx) const { const Context* threadCtx = getThreadContext(false); diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h index c70885d28c5..3fa3292fb1f 100644 --- a/cpp/src/Ice/ImplicitContextI.h +++ b/cpp/src/Ice/ImplicitContextI.h @@ -18,12 +18,14 @@ namespace Ice // // The base class for all ImplicitContext implementations // +class ImplicitContextI; +ICE_DEFINE_PTR(ImplicitContextIPtr,ImplicitContextI); class ImplicitContextI : public ImplicitContext { public: - - static ImplicitContextI* create(const std::string&); + + static ImplicitContextIPtr create(const std::string&); #ifdef _WIN32 static void cleanupThread(); @@ -45,7 +47,7 @@ public: }; -typedef IceInternal::Handle ImplicitContextIPtr; +ICE_DEFINE_PTR(ImplicitContextIPtr, ImplicitContextI); } #endif diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 8b7e8a33ea4..55071b685c1 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -46,7 +46,12 @@ IceInternal::IncomingBase::IncomingBase(Instance* instance, ResponseHandler* res _responseHandler(responseHandler) { _current.adapter = adapter; +#ifdef ICE_CPP11_MAPPING + ::Ice::ConnectionI* conn = dynamic_cast<::Ice::ConnectionI*>(connection); + _current.con = conn ? dynamic_pointer_cast<::Ice::ConnectionI>(conn->shared_from_this()) : nullptr; +#else _current.con = connection; +#endif _current.requestId = requestId; } @@ -179,7 +184,7 @@ IceInternal::IncomingBase::__warning(const Exception& ex) const if(_current.con) { Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); - Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo); + Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo); if(ipConnInfo) { out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort; @@ -200,7 +205,7 @@ IceInternal::IncomingBase::__warning(const string& msg) const if(_current.con) { Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); - Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo); + Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo); if(ipConnInfo) { out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort; @@ -555,7 +560,14 @@ void IceInternal::Incoming::setActive(IncomingAsync& cb) { assert(_cb == 0); - _cb = &cb; // acquires a ref-count + // + // acquires a ref-count + // +#ifdef ICE_CPP11_MAPPING + _cb = cb.shared_from_this(); +#else + _cb = &cb; +#endif } void diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp index b37f83246f3..3b4820cdbbb 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -23,8 +23,10 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; } IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; } +#endif namespace { @@ -54,7 +56,11 @@ Init init; IceInternal::IncomingAsync::IncomingAsync(Incoming& in) : IncomingBase(in), _instanceCopy(_os.instance()), +#ifdef ICE_CPP11_MAPPING + _responseHandlerCopy(dynamic_pointer_cast(_responseHandler->shared_from_this())), +#else _responseHandlerCopy(_responseHandler), +#endif _retriable(in.isRetriable()), _active(true) { @@ -291,6 +297,7 @@ IceInternal::IncomingAsync::__validateResponse(bool ok) return true; } +#ifndef ICE_CPP11_MAPPING IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) : IncomingAsync(in) { @@ -338,3 +345,4 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair -makePair(const vector& v) -{ - if(v.empty()) - { - return pair(static_cast(0), static_cast(0)); - } - else - { - return pair(&v[0], &v[0] + v.size()); - } -} - IceUtil::Mutex* globalMutex = 0; Ice::LoggerPtr processLogger; @@ -134,13 +121,13 @@ Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[]) PropertiesPtr Ice::createProperties() { - return new PropertiesI(IceUtil::getProcessStringConverter()); + return PropertiesPtr(new PropertiesI(IceUtil::getProcessStringConverter())); } PropertiesPtr Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults) { - return new PropertiesI(args, defaults, IceUtil::getProcessStringConverter()); + return PropertiesPtr(new PropertiesI(args, defaults, IceUtil::getProcessStringConverter())); } PropertiesPtr @@ -154,7 +141,7 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults) Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, const ThreadNotificationPtr& threadHook) { - if(communicator == 0) + if(communicator == ICE_NULLPTR) { throw PluginInitializationException(__FILE__, __LINE__, "Communicator cannot be null"); } @@ -229,18 +216,16 @@ Ice::initialize(int& argc, char* argv[], const InitializationData& initializatio InitializationData initData = initializationData; initData.properties = createProperties(argc, argv, initData.properties); - CommunicatorI* communicatorI = new CommunicatorI(initData); - CommunicatorPtr result = communicatorI; // For exception safety. - communicatorI->finishSetup(argc, argv); - return result; + CommunicatorIPtr communicator = CommunicatorI::create(initData); + communicator->finishSetup(argc, argv); + return communicator; } CommunicatorPtr Ice::initialize(StringSeq& args, const InitializationData& initializationData, Int version) { - CommunicatorPtr communicator; IceUtilInternal::ArgVector av(args); - communicator = initialize(av.argc, av.argv, initializationData, version); + CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData, version); args = argsToStringSeq(av.argc, av.argv); return communicator; } @@ -254,14 +239,32 @@ Ice::initialize(const InitializationData& initData, Int version) // checkIceVersion(version); - CommunicatorI* communicatorI = new CommunicatorI(initData); - CommunicatorPtr result = communicatorI; // For exception safety. + CommunicatorIPtr communicator = CommunicatorI::create(initData); int argc = 0; char* argv[] = { 0 }; - communicatorI->finishSetup(argc, argv); - return result; + communicator->finishSetup(argc, argv); + return communicator; } +#ifndef ICE_CPP11_MAPPING + +namespace +{ + +pair +makePair(const vector& v) +{ + if(v.empty()) + { + return pair(static_cast(0), static_cast(0)); + } + else + { + return pair(&v[0], &v[0] + v.size()); + } +} + +} InputStreamPtr Ice::createInputStream(const CommunicatorPtr& communicator, const vector& bytes) { @@ -323,18 +326,19 @@ Ice::createOutputStream(const CommunicatorPtr& communicator, const EncodingVersi { return new OutputStreamI(communicator, v); } +#endif LoggerPtr Ice::getProcessLogger() { IceUtilInternal::MutexPtrLock lock(globalMutex); - if(processLogger == 0) + if(processLogger == ICE_NULLPTR) { // // TODO: Would be nice to be able to use process name as prefix by default. // - processLogger = new Ice::LoggerI("", "", true, IceUtil::getProcessStringConverter()); + processLogger = ICE_MAKE_SHARED(Ice::LoggerI, "", "", true, IceUtil::getProcessStringConverter()); } return processLogger; } @@ -356,7 +360,7 @@ Ice::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool InstancePtr IceInternal::getInstance(const CommunicatorPtr& communicator) { - CommunicatorI* p = dynamic_cast(communicator.get()); + CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator); assert(p); return p->_instance; } @@ -364,12 +368,12 @@ IceInternal::getInstance(const CommunicatorPtr& communicator) IceUtil::TimerPtr IceInternal::getInstanceTimer(const CommunicatorPtr& communicator) { - CommunicatorI* p = dynamic_cast(communicator.get()); + CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator); assert(p); return p->_instance->timer(); } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER Ice::DispatcherPtr Ice::newDispatcher(const ::std::function& cb) { @@ -393,9 +397,7 @@ Ice::newDispatcher(const ::std::function& cb) { @@ -417,6 +419,6 @@ Ice::newBatchRequestInterceptor(const ::std::function _cb; }; - return new Cpp11BatchRequestInterceptor(cb); + return ICE_MAKE_SHARED(Cpp11BatchRequestInterceptor, cb); } #endif diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 4b3590c01de..f3f8e2d768d 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -691,7 +691,7 @@ IceInternal::Instance::identityToString(const Identity& ident) const } } -Ice::ObjectPrx +Ice::ObjectPrxPtr IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity) { ObjectAdapterPtr adapter = adminAdapter; @@ -759,7 +759,7 @@ IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const I return adapter->createProxy(adminIdentity); } -Ice::ObjectPrx +Ice::ObjectPrxPtr IceInternal::Instance::getAdmin() { Lock sync(*this); @@ -850,12 +850,12 @@ IceInternal::Instance::addAllAdminFacets() void IceInternal::Instance::setServerProcessProxy(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity) { - ObjectPrx admin = adminAdapter->createProxy(adminIdentity); - LocatorPrx locator = adminAdapter->getLocator(); + ObjectPrxPtr admin = adminAdapter->createProxy(adminIdentity); + LocatorPrxPtr locator = adminAdapter->getLocator(); const string serverId = _initData.properties->getProperty("Ice.Admin.ServerId"); if(locator && serverId != "") { - ProcessPrx process = ProcessPrx::uncheckedCast(admin->ice_facet("Process")); + ProcessPrxPtr process = ICE_UNCHECKED_CAST(ProcessPrx, admin->ice_facet("Process")); try { // @@ -1009,7 +1009,7 @@ IceInternal::Instance::findAllAdminFacets() } void -IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrx& defaultLocator) +IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrxPtr& defaultLocator) { Lock sync(*this); @@ -1022,7 +1022,7 @@ IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrx& defaultLocator) } void -IceInternal::Instance::setDefaultRouter(const Ice::RouterPrx& defaultRouter) +IceInternal::Instance::setDefaultRouter(const Ice::RouterPrxPtr& defaultRouter) { Lock sync(*this); @@ -1222,23 +1222,23 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi throw InitializationException(__FILE__, __LINE__, "Both syslog and file logger cannot be enabled."); } - _initData.logger = - new SysLoggerI(_initData.properties->getProperty("Ice.ProgramName"), - _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER")); + _initData.logger = ICE_MAKE_SHARED(SysLoggerI, + _initData.properties->getProperty("Ice.ProgramName"), + _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER")); } else #endif if(!logfile.empty()) { - _initData.logger = new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), logfile); + _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), logfile); } else { _initData.logger = getProcessLogger(); - if(LoggerIPtr::dynamicCast(_initData.logger)) + if(ICE_DYNAMIC_CAST(Logger, _initData.logger)) { - _initData.logger = new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), "", - logStdErrConvert, _stringConverter); + _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), "", + logStdErrConvert, _stringConverter); } } } @@ -1347,13 +1347,13 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _dynamicLibraryList = new DynamicLibraryList; - _pluginManager = new PluginManagerI(communicator, _dynamicLibraryList); + _pluginManager = ICE_MAKE_SHARED(PluginManagerI, communicator, _dynamicLibraryList); _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this); _servantFactoryManager = new ObjectFactoryManager(); - _objectAdapterFactory = new ObjectAdapterFactory(this, communicator); + _objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator); _retryQueue = new RetryQueue(this); @@ -1494,7 +1494,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica const string processFacetName = "Process"; if(_adminFacetFilter.empty() || _adminFacetFilter.find(processFacetName) != _adminFacetFilter.end()) { - _adminFacets.insert(make_pair(processFacetName, new ProcessI(communicator))); + _adminFacets.insert(make_pair(processFacetName, ICE_MAKE_SHARED(ProcessI, communicator))); } // @@ -1515,7 +1515,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica PropertiesAdminIPtr propsAdmin; if(_adminFacetFilter.empty() || _adminFacetFilter.find(propertiesFacetName) != _adminFacetFilter.end()) { - propsAdmin = new PropertiesAdminI(_initData.properties, _initData.logger); + propsAdmin = ICE_MAKE_SHARED(PropertiesAdminI, _initData.properties, _initData.logger); _adminFacets.insert(make_pair(propertiesFacetName, propsAdmin)); } @@ -1525,7 +1525,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica const string metricsFacetName = "Metrics"; if(_adminFacetFilter.empty() || _adminFacetFilter.find(metricsFacetName) != _adminFacetFilter.end()) { - CommunicatorObserverIPtr observer = new CommunicatorObserverI(_initData); + CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI, _initData); _initData.observer = observer; _adminFacets.insert(make_pair(metricsFacetName, observer->getFacet())); @@ -1544,7 +1544,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica // if(_initData.observer) { - _initData.observer->setObserverUpdater(new ObserverUpdaterI(this)); + _initData.observer->setObserverUpdater(ICE_MAKE_SHARED(ObserverUpdaterI, this)); } // @@ -1589,7 +1589,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica // if(!_referenceFactory->getDefaultRouter()) { - RouterPrx router = RouterPrx::uncheckedCast(_proxyFactory->propertyToProxy("Ice.Default.Router")); + RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _proxyFactory->propertyToProxy("Ice.Default.Router")); if(router) { _referenceFactory = _referenceFactory->setDefaultRouter(router); @@ -1598,7 +1598,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica if(!_referenceFactory->getDefaultLocator()) { - LocatorPrx locator = LocatorPrx::uncheckedCast(_proxyFactory->propertyToProxy("Ice.Default.Locator")); + LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _proxyFactory->propertyToProxy("Ice.Default.Locator")); if(locator) { _referenceFactory = _referenceFactory->setDefaultLocator(locator); @@ -1715,7 +1715,7 @@ IceInternal::Instance::destroy() if(_initData.observer) { - CommunicatorObserverIPtr observer = CommunicatorObserverIPtr::dynamicCast(_initData.observer); + CommunicatorObserverIPtr observer = ICE_DYNAMIC_CAST(CommunicatorObserverI, _initData.observer); if(observer) { observer->destroy(); // Break cyclic reference counts. Don't clear _observer, it's immutable. @@ -1723,7 +1723,7 @@ IceInternal::Instance::destroy() _initData.observer->setObserverUpdater(0); // Break cyclic reference count. } - LoggerAdminLoggerPtr logger = LoggerAdminLoggerPtr::dynamicCast(_initData.logger); + LoggerAdminLoggerPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLogger, _initData.logger); if(logger) { // diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index a6e9182b136..32685e2e9b5 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -58,7 +58,7 @@ class Timer; typedef IceUtil::Handle TimerPtr; class MetricsAdminI; -typedef IceUtil::Handle MetricsAdminIPtr; +ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI); class RequestHandlerFactory; typedef IceUtil::Handle RequestHandlerFactoryPtr; @@ -116,8 +116,8 @@ public: Ice::Identity stringToIdentity(const std::string&) const; std::string identityToString(const Ice::Identity&) const; - Ice::ObjectPrx createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&); - Ice::ObjectPrx getAdmin(); + Ice::ObjectPrxPtr createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&); + Ice::ObjectPrxPtr getAdmin(); void addAdminFacet(const Ice::ObjectPtr&, const std::string&); Ice::ObjectPtr removeAdminFacet(const std::string&); Ice::ObjectPtr findAdminFacet(const std::string&); @@ -128,8 +128,8 @@ public: return _implicitContext; } - void setDefaultLocator(const Ice::LocatorPrx&); - void setDefaultRouter(const Ice::RouterPrx&); + void setDefaultLocator(const Ice::LocatorPrxPtr&); + void setDefaultRouter(const Ice::RouterPrxPtr&); void setLogger(const Ice::LoggerPtr&); void setThreadHook(const Ice::ThreadNotificationPtr&); diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 60d17e89b21..f5ddd6e6fb4 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -22,7 +22,7 @@ using namespace IceInternal; using namespace Ice::Instrumentation; using namespace IceMX; -namespace +namespace { Context emptyCtx; @@ -44,14 +44,14 @@ getThreadStateMetric(ThreadState s) assert(false); return 0; } -} +} -struct ThreadStateChanged +struct ThreadStateChanged { ThreadStateChanged(ThreadState oldState, ThreadState newState) : oldState(oldState), newState(newState) { } - + void operator()(const ThreadMetricsPtr& v) { if(oldState != ThreadStateIdle) @@ -75,7 +75,7 @@ public: class Attributes : public AttributeResolverT { public: - + Attributes() { add("parent", &ConnectionHelper::getParent); @@ -85,8 +85,8 @@ public: } }; static Attributes attributes; - - ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) : + + ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) : _connectionInfo(con), _endpoint(endpt), _state(state) { } @@ -102,7 +102,7 @@ public: if(_id.empty()) { ostringstream os; - IPConnectionInfoPtr info = IPConnectionInfoPtr::dynamicCast(_connectionInfo); + IPConnectionInfoPtr info = ICE_DYNAMIC_CAST(IPConnectionInfo, _connectionInfo); if(info) { os << info->localAddress << ':' << info->localPort; @@ -142,8 +142,8 @@ public: return ""; } } - - string + + string getParent() const { if(!_connectionInfo->adapterName.empty()) @@ -155,7 +155,7 @@ public: return "Communicator"; } } - + const ConnectionInfoPtr& getConnectionInfo() const { @@ -177,7 +177,7 @@ public: } return _endpointInfo; } - + private: const ConnectionInfoPtr& _connectionInfo; @@ -196,7 +196,7 @@ public: class Attributes : public AttributeResolverT { public: - + Attributes() { add("parent", &DispatchHelper::getParent); @@ -215,7 +215,7 @@ public: } }; static Attributes attributes; - + DispatchHelper(const Current& current, int size) : _current(current), _size(size) { } @@ -265,7 +265,7 @@ public: return _id; } - string + string getParent() const { return _current.adapter->getName(); @@ -336,7 +336,7 @@ public: class Attributes : public AttributeResolverT { public: - + Attributes() { add("parent", &InvocationHelper::getParent); @@ -353,8 +353,8 @@ public: } }; static Attributes attributes; - - InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx = emptyCtx) : + + InvocationHelper(const ObjectPrxPtr& proxy, const string& op, const Context& ctx = emptyCtx) : _proxy(proxy), _operation(op), _context(ctx) { } @@ -388,23 +388,23 @@ public: if(_proxy->ice_isTwoway()) { return "twoway"; - } + } else if(_proxy->ice_isOneway()) { return "oneway"; - } + } else if(_proxy->ice_isBatchOneway()) { return "batch-oneway"; - } + } else if(_proxy->ice_isDatagram()) { return "datagram"; - } + } else if(_proxy->ice_isBatchDatagram()) { return "batch-datagram"; - } + } else { throw invalid_argument("mode"); @@ -439,13 +439,13 @@ public: return _id; } - string + string getParent() const { return "Communicator"; } - const ObjectPrx& + const ObjectPrxPtr& getProxy() const { return _proxy; @@ -473,7 +473,7 @@ public: private: - const ObjectPrx& _proxy; + const ObjectPrxPtr& _proxy; const string& _operation; const Context& _context; mutable string _id; @@ -488,7 +488,7 @@ public: class Attributes : public AttributeResolverT { public: - + Attributes() { add("parent", &RemoteInvocationHelper::getParent); @@ -498,8 +498,8 @@ public: } }; static Attributes attributes; - - RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) : + + RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) : _connectionInfo(con), _endpoint(endpt), _requestId(requestId), _size(size) { } @@ -527,8 +527,8 @@ public: } return _id; } - - string + + string getParent() const { if(!_connectionInfo->adapterName.empty()) @@ -540,7 +540,7 @@ public: return "Communicator"; } } - + const ConnectionInfoPtr& getConnectionInfo() const { @@ -590,7 +590,7 @@ public: class Attributes : public AttributeResolverT { public: - + Attributes() { add("parent", &CollocatedInvocationHelper::getParent); @@ -599,8 +599,8 @@ public: } }; static Attributes attributes; - - CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) : + + CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) : _requestId(requestId), _size(size), _id(adapter->getName()) { } @@ -620,8 +620,8 @@ public: { return _id; } - - string + + string getParent() const { return "Communicator"; @@ -649,7 +649,7 @@ public: class Attributes : public AttributeResolverT { public: - + Attributes() { add("parent", &ThreadHelper::_parent); @@ -657,7 +657,7 @@ public: } }; static Attributes attributes; - + ThreadHelper(const string& parent, const string& id, ThreadState state) : _parent(parent), _id(id), _state(state) { } @@ -676,7 +676,7 @@ public: } private: - + const string _parent; const string _id; const ThreadState _state; @@ -691,7 +691,7 @@ public: class Attributes : public AttributeResolverT { public: - + Attributes() { add("parent", &EndpointHelper::getParent); @@ -700,7 +700,7 @@ public: } }; static Attributes attributes; - + EndpointHelper(const EndpointPtr& endpt, const string& id) : _endpoint(endpt), _id(id) { } @@ -747,7 +747,7 @@ public: } private: - + const EndpointPtr _endpoint; mutable string _id; mutable EndpointInfoPtr _endpointInfo; @@ -757,7 +757,7 @@ EndpointHelper::Attributes EndpointHelper::attributes; } -void +void ConnectionObserverI::sentBytes(Int num) { forEach(add(&ConnectionMetrics::sentBytes, num)); @@ -767,7 +767,7 @@ ConnectionObserverI::sentBytes(Int num) } } -void +void ConnectionObserverI::receivedBytes(Int num) { forEach(add(&ConnectionMetrics::receivedBytes, num)); @@ -849,8 +849,8 @@ InvocationObserverI::userException() } RemoteObserverPtr -InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, - const EndpointPtr& endpoint, +InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, + const EndpointPtr& endpoint, int requestId, int size) { @@ -861,7 +861,7 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, { delegate = _delegate->getRemoteObserver(connection, endpoint, requestId, size); } - return getObserverWithDelegate("Remote", + return getObserverWithDelegate("Remote", RemoteInvocationHelper(connection, endpoint, requestId, size), delegate); } @@ -891,7 +891,7 @@ InvocationObserverI::getCollocatedObserver(const Ice::ObjectAdapterPtr& adapter, return 0; } -CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) : +CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) : _metrics(new MetricsAdminI(initData.properties, initData.logger)), _delegate(initData.observer), _connections(_metrics, "Connection"), @@ -962,10 +962,10 @@ CommunicatorObserverI::getEndpointLookupObserver(const EndpointPtr& endpt) return 0; } -ConnectionObserverPtr -CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con, +ConnectionObserverPtr +CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con, const EndpointPtr& endpt, - ConnectionState state, + ConnectionState state, const ConnectionObserverPtr& observer) { if(_connections.isEnabled()) @@ -989,8 +989,8 @@ CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con, return 0; } -ThreadObserverPtr -CommunicatorObserverI::getThreadObserver(const string& parent, +ThreadObserverPtr +CommunicatorObserverI::getThreadObserver(const string& parent, const string& id, ThreadState state, const ThreadObserverPtr& observer) @@ -1016,8 +1016,8 @@ CommunicatorObserverI::getThreadObserver(const string& parent, return 0; } -InvocationObserverPtr -CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const string& op, const Context& ctx) +InvocationObserverPtr +CommunicatorObserverI::getInvocationObserver(const ObjectPrxPtr& proxy, const string& op, const Context& ctx) { if(_invocations.isEnabled()) { @@ -1039,7 +1039,7 @@ CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const strin return 0; } -DispatchObserverPtr +DispatchObserverPtr CommunicatorObserverI::getDispatchObserver(const Current& current, int size) { if(_dispatch.isEnabled()) @@ -1062,7 +1062,7 @@ CommunicatorObserverI::getDispatchObserver(const Current& current, int size) return 0; } -const IceInternal::MetricsAdminIPtr& +const IceInternal::MetricsAdminIPtr& CommunicatorObserverI::getFacet() const { assert(_metrics); diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h index 53994591414..7ae26d19b2b 100644 --- a/cpp/src/Ice/InstrumentationI.h +++ b/cpp/src/Ice/InstrumentationI.h @@ -21,9 +21,8 @@ template class ObserverWithDelegateT : public IceMX::Obs public: typedef O ObserverType; - typedef typename IceInternal::Handle ObserverPtrType; - - virtual void + typedef typename ICE_INTERNAL_HANDLE ObserverPtrType; + virtual void attach() { IceMX::ObserverT::attach(); @@ -33,7 +32,7 @@ public: } } - virtual void + virtual void detach() { IceMX::ObserverT::detach(); @@ -65,11 +64,11 @@ public: _delegate = delegate; } - template ObserverPtrType - getObserverWithDelegate(const std::string& mapName, const IceMX::MetricsHelperT& helper, + template ObserverPtrType + getObserverWithDelegate(const std::string& mapName, const IceMX::MetricsHelperT& helper, const ObserverPtrType& del) { - IceInternal::Handle obsv = IceMX::ObserverT::template getObserver(mapName, + ICE_INTERNAL_HANDLE obsv = IceMX::ObserverT::template getObserver(mapName, helper); if(obsv) { @@ -88,15 +87,15 @@ template class ObserverFactoryWithDelegateT : public IceMX::Observer { public: - ObserverFactoryWithDelegateT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) : + ObserverFactoryWithDelegateT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) : IceMX::ObserverFactoryT(metrics, name) { } - template ObserverPtrType + template ObserverPtrType getObserverWithDelegate(const IceMX::MetricsHelperT& helper, const ObserverPtrType& del) { - IceInternal::Handle obsv = IceMX::ObserverFactoryT::getObserver(helper); + ICE_INTERNAL_HANDLE obsv = IceMX::ObserverFactoryT::getObserver(helper); if(obsv) { obsv->setDelegate(del); @@ -105,11 +104,11 @@ public: return del; } - template ObserverPtrType - getObserverWithDelegate(const IceMX::MetricsHelperT& helper, const ObserverPtrType& del, + template ObserverPtrType + getObserverWithDelegate(const IceMX::MetricsHelperT& helper, const ObserverPtrType& del, const ObserverPtrType& old) { - IceInternal::Handle obsv = IceMX::ObserverFactoryT::getObserver(helper, old); + ICE_INTERNAL_HANDLE obsv = IceMX::ObserverFactoryT::getObserver(helper, old); if(obsv) { obsv->setDelegate(del); @@ -129,7 +128,7 @@ void addEndpointAttributes(typename Helper::Attributes& attrs) attrs.add("endpointIsSecure", &Helper::getEndpointInfo, &Ice::EndpointInfo::secure); attrs.add("endpointTimeout", &Helper::getEndpointInfo, &Ice::EndpointInfo::timeout); attrs.add("endpointCompress", &Helper::getEndpointInfo, &Ice::EndpointInfo::compress); - + attrs.add("endpointHost", &Helper::getEndpointInfo, &Ice::IPEndpointInfo::host); attrs.add("endpointPort", &Helper::getEndpointInfo, &Ice::IPEndpointInfo::port); } @@ -140,19 +139,19 @@ void addConnectionAttributes(typename Helper::Attributes& attrs) attrs.add("incoming", &Helper::getConnectionInfo, &Ice::ConnectionInfo::incoming); attrs.add("adapterName", &Helper::getConnectionInfo, &Ice::ConnectionInfo::adapterName); attrs.add("connectionId", &Helper::getConnectionInfo, &Ice::ConnectionInfo::connectionId); - + attrs.add("localHost", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::localAddress); attrs.add("localPort", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::localPort); attrs.add("remoteHost", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::remoteAddress); attrs.add("remotePort", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::remotePort); - + attrs.add("mcastHost", &Helper::getConnectionInfo, &Ice::UDPConnectionInfo::mcastAddress); attrs.add("mcastPort", &Helper::getConnectionInfo, &Ice::UDPConnectionInfo::mcastPort); - + addEndpointAttributes(attrs); } -class ConnectionObserverI : public ObserverWithDelegateT { public: @@ -184,7 +183,7 @@ public: virtual void reply(Ice::Int); }; -class CollocatedObserverI : public ObserverWithDelegateT { public: @@ -192,7 +191,7 @@ public: virtual void reply(Ice::Int); }; -class InvocationObserverI : public ObserverWithDelegateT { public: @@ -201,7 +200,7 @@ public: virtual void userException(); - virtual Ice::Instrumentation::RemoteObserverPtr + virtual Ice::Instrumentation::RemoteObserverPtr getRemoteObserver(const Ice::ConnectionInfoPtr&, const Ice::EndpointPtr&, Ice::Int, Ice::Int); virtual Ice::Instrumentation::CollocatedObserverPtr @@ -217,23 +216,23 @@ public: CommunicatorObserverI(const Ice::InitializationData&); virtual void setObserverUpdater(const Ice::Instrumentation::ObserverUpdaterPtr&); - + virtual Ice::Instrumentation::ObserverPtr getConnectionEstablishmentObserver(const Ice::EndpointPtr&, const std::string&); - + virtual Ice::Instrumentation::ObserverPtr getEndpointLookupObserver(const Ice::EndpointPtr&); - - virtual Ice::Instrumentation::ConnectionObserverPtr - getConnectionObserver(const Ice::ConnectionInfoPtr&, + + virtual Ice::Instrumentation::ConnectionObserverPtr + getConnectionObserver(const Ice::ConnectionInfoPtr&, const Ice::EndpointPtr&, - Ice::Instrumentation::ConnectionState, + Ice::Instrumentation::ConnectionState, const Ice::Instrumentation::ConnectionObserverPtr&); virtual Ice::Instrumentation::ThreadObserverPtr getThreadObserver(const std::string&, const std::string&, Ice::Instrumentation::ThreadState, const Ice::Instrumentation::ThreadObserverPtr&); - virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrx&, + virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrxPtr&, const std::string&, const Ice::Context&); @@ -255,7 +254,7 @@ private: ObserverFactoryWithDelegateT _connects; ObserverFactoryWithDelegateT _endpointLookups; }; -typedef IceUtil::Handle CommunicatorObserverIPtr; +ICE_DEFINE_PTR(CommunicatorObserverIPtr, CommunicatorObserverI); }; diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index b4ea96998b1..f3477c972cc 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include using namespace std; @@ -44,11 +45,31 @@ public: { try { +#ifdef ICE_CPP11_MAPPING + _locatorInfo->getLocator()->findObjectById_async( + _ref->getIdentity(), + [this](const ObjectPrxPtr& object) + { + this->response(object); + }, + [this](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const UserException& ex) + { + this->exception(ex); + } + }); +#else _locatorInfo->getLocator()->begin_findObjectById( _ref->getIdentity(), newCallback_Locator_findObjectById(static_cast(this), &LocatorInfo::Request::response, &LocatorInfo::Request::exception)); +#endif } catch(const Ice::Exception& ex) { @@ -70,11 +91,31 @@ public: { try { +#ifdef ICE_CPP11_MAPPING + _locatorInfo->getLocator()->findAdapterById_async( + _ref->getAdapterId(), + [this](const Ice::ObjectPrxPtr& object) + { + this->response(object); + }, + [this](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const UserException& ex) + { + this->exception(ex); + } + }); +#else _locatorInfo->getLocator()->begin_findAdapterById( _ref->getAdapterId(), newCallback_Locator_findAdapterById(static_cast(this), &LocatorInfo::Request::response, &LocatorInfo::Request::exception)); +#endif } catch(const Ice::Exception& ex) { @@ -96,8 +137,11 @@ IceInternal::LocatorManager::destroy() { IceUtil::Mutex::Lock sync(*this); - for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun(&LocatorInfo::destroy)); - +#ifdef ICE_CPP11_MAPPING + for_each(_table.begin(), _table.end(), [](auto it){ it.second->destroy(); }); +#else + for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun(&LocatorInfo::destroy)); +#endif _table.clear(); _tableHint = _table.end(); @@ -105,14 +149,14 @@ IceInternal::LocatorManager::destroy() } LocatorInfoPtr -IceInternal::LocatorManager::get(const LocatorPrx& loc) +IceInternal::LocatorManager::get(const LocatorPrxPtr& loc) { if(!loc) { return 0; } - LocatorPrx locator = LocatorPrx::uncheckedCast(loc->ice_locator(0)); // The locator can't be located. + LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, loc->ice_locator(0)); // The locator can't be located. // // TODO: reap unused locator info objects? @@ -120,7 +164,7 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc) IceUtil::Mutex::Lock sync(*this); - map::iterator p = _table.end(); + map::iterator p = _table.end(); if(_tableHint != _table.end()) { @@ -152,7 +196,7 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc) } _tableHint = _table.insert(_tableHint, - pair(locator, + pair(locator, new LocatorInfo(locator, t->second, _background))); } @@ -301,7 +345,7 @@ IceInternal::LocatorTable::checkTTL(const IceUtil::Time& time, int ttl) const } void -IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::ObjectPrx& proxy) +IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy) { vector endpoints; if(proxy) @@ -467,7 +511,7 @@ IceInternal::LocatorInfo::Request::Request(const LocatorInfoPtr& locatorInfo, co } void -IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrx& proxy) +IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrxPtr& proxy) { { IceUtil::Monitor::Lock sync(_monitor); @@ -497,7 +541,7 @@ IceInternal::LocatorInfo::Request::exception(const Ice::Exception& ex) } } -IceInternal::LocatorInfo::LocatorInfo(const LocatorPrx& locator, const LocatorTablePtr& table, bool background) : +IceInternal::LocatorInfo::LocatorInfo(const LocatorPrxPtr& locator, const LocatorTablePtr& table, bool background) : _locator(locator), _table(table), _background(background) @@ -518,22 +562,34 @@ IceInternal::LocatorInfo::destroy() bool IceInternal::LocatorInfo::operator==(const LocatorInfo& rhs) const { +#ifdef ICE_CPP11_MAPPING + return Ice::targetEquals(_locator, rhs._locator); +#else return _locator == rhs._locator; +#endif } bool IceInternal::LocatorInfo::operator!=(const LocatorInfo& rhs) const { +#ifdef ICE_CPP11_MAPPING + return !Ice::targetEquals(_locator, rhs._locator); +#else return _locator != rhs._locator; +#endif } bool IceInternal::LocatorInfo::operator<(const LocatorInfo& rhs) const { +#ifdef ICE_CPP11_MAPPING + return Ice::targetLess(_locator, rhs._locator); +#else return _locator < rhs._locator; +#endif } -LocatorRegistryPrx +LocatorRegistryPrxPtr IceInternal::LocatorInfo::getLocatorRegistry() { { @@ -547,7 +603,7 @@ IceInternal::LocatorInfo::getLocatorRegistry() // // Do not make locator calls from within sync. // - LocatorRegistryPrx locatorRegistry = _locator->getRegistry(); + LocatorRegistryPrxPtr locatorRegistry = _locator->getRegistry(); if(!locatorRegistry) { return 0; @@ -877,7 +933,7 @@ IceInternal::LocatorInfo::getObjectRequest(const ReferencePtr& ref) void IceInternal::LocatorInfo::finishRequest(const ReferencePtr& ref, const vector& wellKnownRefs, - const Ice::ObjectPrx& proxy, + const Ice::ObjectPrxPtr& proxy, bool notRegistered) { if(!proxy || proxy->__reference()->isIndirect()) diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index b283a66bb8b..c719eea134d 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -39,14 +39,14 @@ public: // Returns locator info for a given locator. Automatically creates // the locator info if it doesn't exist yet. // - LocatorInfoPtr get(const Ice::LocatorPrx&); + LocatorInfoPtr get(const Ice::LocatorPrxPtr&); private: const bool _background; - std::map _table; - std::map::iterator _tableHint; + std::map _table; + std::map::iterator _tableHint; std::map, LocatorTablePtr> _locatorTables; }; @@ -94,7 +94,7 @@ public: RequestCallback(const ReferencePtr&, int, const GetEndpointsCallbackPtr&); - void response(const LocatorInfoPtr&, const Ice::ObjectPrx&); + void response(const LocatorInfoPtr&, const Ice::ObjectPrxPtr&); void exception(const LocatorInfoPtr&, const Ice::Exception&); private: @@ -112,7 +112,7 @@ public: void addCallback(const ReferencePtr&, const ReferencePtr&, int, const GetEndpointsCallbackPtr&); std::vector getEndpoints(const ReferencePtr&, const ReferencePtr&, int, bool&); - void response(const Ice::ObjectPrx&); + void response(const Ice::ObjectPrxPtr&); void exception(const Ice::Exception&); protected: @@ -131,12 +131,12 @@ public: std::vector _wellKnownRefs; bool _sent; bool _response; - Ice::ObjectPrx _proxy; + Ice::ObjectPrxPtr _proxy; IceUtil::UniquePtr _exception; }; typedef IceUtil::Handle RequestPtr; - LocatorInfo(const Ice::LocatorPrx&, const LocatorTablePtr&, bool); + LocatorInfo(const Ice::LocatorPrxPtr&, const LocatorTablePtr&, bool); void destroy(); @@ -144,14 +144,14 @@ public: bool operator!=(const LocatorInfo&) const; bool operator<(const LocatorInfo&) const; - const Ice::LocatorPrx& getLocator() const + const Ice::LocatorPrxPtr& getLocator() const { // // No mutex lock necessary, _locator is immutable. // return _locator; } - Ice::LocatorRegistryPrx getLocatorRegistry(); + Ice::LocatorRegistryPrxPtr getLocatorRegistry(); std::vector getEndpoints(const ReferencePtr& ref, int ttl, bool& cached) { @@ -176,12 +176,12 @@ private: RequestPtr getAdapterRequest(const ReferencePtr&); RequestPtr getObjectRequest(const ReferencePtr&); - void finishRequest(const ReferencePtr&, const std::vector&, const Ice::ObjectPrx&, bool); + void finishRequest(const ReferencePtr&, const std::vector&, const Ice::ObjectPrxPtr&, bool); friend class Request; friend class RequestCallback; - const Ice::LocatorPrx _locator; - Ice::LocatorRegistryPrx _locatorRegistry; + const Ice::LocatorPrxPtr _locator; + Ice::LocatorRegistryPrxPtr _locatorRegistry; const LocatorTablePtr _table; const bool _background; diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index b48b40be259..64c68dee606 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -32,19 +32,19 @@ class LoggerAdminI : public Ice::LoggerAdmin public: LoggerAdminI(const PropertiesPtr&); - - virtual void attachRemoteLogger(const RemoteLoggerPrx&, const LogMessageTypeSeq&, + + virtual void attachRemoteLogger(const RemoteLoggerPrxPtr&, const LogMessageTypeSeq&, const StringSeq&, Int, const Current&); - - virtual bool detachRemoteLogger(const RemoteLoggerPrx&, const Current&); - + + virtual bool detachRemoteLogger(const RemoteLoggerPrxPtr&, const Current&); + virtual LogMessageSeq getLog(const LogMessageTypeSeq&, const StringSeq&, Int, string&, const Current&); void destroy(); - vector log(const LogMessage&); + vector log(const LogMessage&); - void deadRemoteLogger(const RemoteLoggerPrx&, const LoggerPtr&, const LocalException&, const string&); + void deadRemoteLogger(const RemoteLoggerPrxPtr&, const LoggerPtr&, const LocalException&, const string&); const int getTraceLevel() const { @@ -53,9 +53,11 @@ public: private: - bool removeRemoteLogger(const RemoteLoggerPrx&); - + bool removeRemoteLogger(const RemoteLoggerPrxPtr&); + +#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_init callback void initCompleted(const AsyncResultPtr&); +#endif IceUtil::Mutex _mutex; list _queue; @@ -70,7 +72,7 @@ private: struct ObjectIdentityCompare { - bool operator()(const RemoteLoggerPrx& lhs, const RemoteLoggerPrx& rhs) const + bool operator()(const RemoteLoggerPrxPtr& lhs, const RemoteLoggerPrxPtr& rhs) const { // // Caller should make sure that proxies are never null @@ -93,7 +95,7 @@ private: const set traceCategories; }; - typedef map RemoteLoggerMap; + typedef map RemoteLoggerMap; struct GetRemoteLoggerMapKey { @@ -108,29 +110,29 @@ private: CommunicatorPtr _sendLogCommunicator; bool _destroyed; }; -typedef IceUtil::Handle LoggerAdminIPtr; +ICE_DEFINE_PTR(LoggerAdminIPtr, LoggerAdminI); class Job : public IceUtil::Shared { public: - Job(const vector& r, const LogMessage& l) : + Job(const vector& r, const LogMessage& l) : remoteLoggers(r), logMessage(l) { } - const vector remoteLoggers; + const vector remoteLoggers; const LogMessage logMessage; }; typedef IceUtil::Handle JobPtr; -class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger +class LoggerAdminLoggerI : public ICE_ENABLE_SHARED_FROM_THIS(LoggerAdminLoggerI), public IceInternal::LoggerAdminLogger { public: - + LoggerAdminLoggerI(const PropertiesPtr&, const LoggerPtr&); virtual void print(const std::string&); @@ -141,22 +143,23 @@ public: virtual LoggerPtr cloneWithPrefix(const std::string&); virtual ObjectPtr getFacet() const; - + virtual void destroy(); const LoggerPtr& getLocalLogger() const { return _localLogger; } - + void run(); private: void log(const LogMessage&); - +#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_log callback void logCompleted(const AsyncResultPtr&); - +#endif + LoggerPtr _localLogger; const LoggerAdminIPtr _loggerAdmin; @@ -164,9 +167,9 @@ private: bool _destroyed; IceUtil::ThreadPtr _sendLogThread; - std::deque _jobQueue; + std::deque _jobQueue; }; -typedef IceUtil::Handle LoggerAdminLoggerIPtr; +ICE_DEFINE_PTR(LoggerAdminLoggerIPtr, LoggerAdminLoggerI); class SendLogThread : public IceUtil::Thread @@ -195,7 +198,7 @@ filterLogMessages(LogMessageSeq& logMessages, const set& message const set& traceCategories, Int messageMax) { assert(!logMessages.empty() && messageMax != 0); - + // // Filter only if one of the 3 filters is set; messageMax < 0 means "give me all" // that match the other filters, if any. @@ -209,7 +212,7 @@ filterLogMessages(LogMessageSeq& logMessages, const set& message bool keepIt = false; if(messageTypes.empty() || messageTypes.count(p->type) != 0) { - if(p->type != TraceMessage || traceCategories.empty() || + if(p->type != ICE_ENUM(LogMessageType, TraceMessage) || traceCategories.empty() || traceCategories.count(p->traceCategory) != 0) { keepIt = true; @@ -246,15 +249,15 @@ filterLogMessages(LogMessageSeq& logMessages, const set& message // // Change this proxy's communicator, while keeping its invocation timeout // -RemoteLoggerPrx -changeCommunicator(const RemoteLoggerPrx& prx, const CommunicatorPtr& communicator) +RemoteLoggerPrxPtr +changeCommunicator(const RemoteLoggerPrxPtr& prx, const CommunicatorPtr& communicator) { if(prx == 0) { return 0; } - RemoteLoggerPrx result = RemoteLoggerPrx::uncheckedCast(communicator->stringToProxy(prx->ice_toString())); + RemoteLoggerPrxPtr result = ICE_UNCHECKED_CAST(RemoteLoggerPrx, communicator->stringToProxy(prx->ice_toString())); return result->ice_invocationTimeout(prx->ice_getInvocationTimeout()); } @@ -312,7 +315,7 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) : _logCount(0), _maxLogCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100)), _traceCount(0), - _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)), + _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)), _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger")), _destroyed(false) { @@ -321,7 +324,7 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) : } void -LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, +LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrxPtr& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& categories, Int messageMax, @@ -331,13 +334,13 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, { return; // can't send this null RemoteLogger anything! } - + // // In C++, LoggerAdminI does not keep a "logger" data member to avoid a hard-to-break circular // reference, so we retrieve the logger from Current // - - LoggerAdminLoggerIPtr logger = LoggerAdminLoggerIPtr::dynamicCast(current.adapter->getCommunicator()->getLogger()); + + LoggerAdminLoggerIPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLoggerI, current.adapter->getCommunicator()->getLogger()); if(!logger) { // Our logger is not installed - must be a bug @@ -345,7 +348,7 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, return; } - RemoteLoggerPrx remoteLogger = prx->ice_twoway(); + RemoteLoggerPrxPtr remoteLogger = prx->ice_twoway(); Filters filters(messageTypes, categories); LogMessageSeq initLogMessages; @@ -391,8 +394,37 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, filterLogMessages(initLogMessages, filters.messageTypes, filters.traceCategories, messageMax); } +#ifdef ICE_CPP11_MAPPING + try + { + remoteLogger->init_async(logger->getPrefix(), initLogMessages, + [this, logger, remoteLogger]() + { + if(this->_traceLevel > 1) + { + Trace trace(logger, traceCategory); + trace << "init on `" << remoteLogger << "' completed successfully"; + } + }, + [this, logger, remoteLogger](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const Ice::LocalException& e) + { + this->deadRemoteLogger(remoteLogger, logger, e, "init"); + } + }); + } + catch(const LocalException& ex) + { + deadRemoteLogger(remoteLogger, logger, ex, "init"); + throw; + } +#else CallbackPtr initCompletedCb = newCallback(this, &LoggerAdminI::initCompleted); - try { remoteLogger->begin_init(logger->getPrefix(), initLogMessages, initCompletedCb, logger); @@ -402,10 +434,11 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, deadRemoteLogger(remoteLogger, logger, ex, "init"); throw; } +#endif } bool -LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Current& current) +LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger, const Current& current) { if(remoteLogger == 0) { @@ -429,11 +462,11 @@ LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Curr trace << "cannot detach `" << remoteLogger << "': not found"; } } - + return found; } -LogMessageSeq +LogMessageSeq LoggerAdminI::getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& categories, Int messageMax, string& prefix, const Current& current) { @@ -449,13 +482,13 @@ LoggerAdminI::getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& cat LoggerPtr logger = current.adapter->getCommunicator()->getLogger(); prefix = logger->getPrefix(); - + if(!logMessages.empty()) { Filters filters(messageTypes, categories); filterLogMessages(logMessages, filters.messageTypes, filters.traceCategories, messageMax); } - + return logMessages; } @@ -467,14 +500,14 @@ LoggerAdminI::destroy() IceUtil::Mutex::Lock lock(_mutex); if(!_destroyed) { - _destroyed = true; + _destroyed = true; sendLogCommunicator = _sendLogCommunicator; _sendLogCommunicator = 0; } } - + // - // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to + // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to // remote logggers // if(sendLogCommunicator) @@ -483,22 +516,22 @@ LoggerAdminI::destroy() } } -vector +vector LoggerAdminI::log(const LogMessage& logMessage) { - vector remoteLoggers; + vector remoteLoggers; IceUtil::Mutex::Lock lock(_mutex); // // Put message in _queue // - if((logMessage.type != TraceMessage && _maxLogCount > 0) || - (logMessage.type == TraceMessage && _maxTraceCount > 0)) + if((logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) && _maxLogCount > 0) || + (logMessage.type == ICE_ENUM(LogMessageType, TraceMessage) && _maxTraceCount > 0)) { list::iterator p = _queue.insert(_queue.end(), logMessage); - if(logMessage.type != TraceMessage) + if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage)) { assert(_maxLogCount > 0); if(_logCount == _maxLogCount) @@ -508,7 +541,7 @@ LoggerAdminI::log(const LogMessage& logMessage) // assert(_oldestLog != _queue.end()); _oldestLog = _queue.erase(_oldestLog); - while(_oldestLog != _queue.end() && _oldestLog->type == TraceMessage) + while(_oldestLog != _queue.end() && _oldestLog->type == ICE_ENUM(LogMessageType, TraceMessage)) { _oldestLog++; } @@ -534,7 +567,7 @@ LoggerAdminI::log(const LogMessage& logMessage) // assert(_oldestTrace != _queue.end()); _oldestTrace = _queue.erase(_oldestTrace); - while(_oldestTrace != _queue.end() && _oldestTrace->type != TraceMessage) + while(_oldestTrace != _queue.end() && _oldestTrace->type != ICE_ENUM(LogMessageType, TraceMessage)) { _oldestTrace++; } @@ -560,7 +593,7 @@ LoggerAdminI::log(const LogMessage& logMessage) if(filters.messageTypes.empty() || filters.messageTypes.count(logMessage.type) != 0) { - if(logMessage.type != TraceMessage || filters.traceCategories.empty() || + if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) || filters.traceCategories.empty() || filters.traceCategories.count(logMessage.traceCategory) != 0) { remoteLoggers.push_back(p->first); @@ -572,7 +605,7 @@ LoggerAdminI::log(const LogMessage& logMessage) } void -LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrx& remoteLogger, +LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger, const LoggerPtr& logger, const LocalException& ex, const string& operation) @@ -591,39 +624,44 @@ LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrx& remoteLogger, } bool -LoggerAdminI::removeRemoteLogger(const RemoteLoggerPrx& remoteLogger) +LoggerAdminI::removeRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger) { IceUtil::Mutex::Lock lock(_mutex); return _remoteLoggerMap.erase(remoteLogger) > 0; } +#ifndef ICE_CPP11_MAPPING +// +// begin_init callback method for C++98 mapping +// void LoggerAdminI::initCompleted(const AsyncResultPtr& r) { - RemoteLoggerPrx remoteLogger = RemoteLoggerPrx::uncheckedCast(r->getProxy()); - -try + RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy()); + + try { remoteLogger->end_init(r); if(_traceLevel > 1) { - LoggerPtr logger = LoggerPtr::dynamicCast(r->getCookie()); + LoggerPtr logger = ICE_DYNAMIC_CAST(Logger, r->getCookie()); Trace trace(logger, traceCategory); trace << r->getOperation() << " on `" << remoteLogger << "' completed successfully"; } } catch(const LocalException& ex) { - deadRemoteLogger(remoteLogger, LoggerPtr::dynamicCast(r->getCookie()), ex, r->getOperation()); + deadRemoteLogger(remoteLogger, ICE_DYNAMIC_CAST(Logger, r->getCookie()), ex, r->getOperation()); } } +#endif // // LoggerAdminLoggerI // -LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props, +LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props, const LoggerPtr& localLogger) : _loggerAdmin(new LoggerAdminI(props)), _destroyed(false) @@ -648,7 +686,7 @@ LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props, void LoggerAdminLoggerI::print(const string& message) { - LogMessage logMessage = { PrintMessage, IceUtil::Time::now().toMicroSeconds(), "", message }; + LogMessage logMessage = { ICE_ENUM(LogMessageType, PrintMessage), IceUtil::Time::now().toMicroSeconds(), "", message }; _localLogger->print(message); log(logMessage); @@ -657,7 +695,7 @@ LoggerAdminLoggerI::print(const string& message) void LoggerAdminLoggerI::trace(const string& category, const string& message) { - LogMessage logMessage = { TraceMessage, IceUtil::Time::now().toMicroSeconds(), category, message }; + LogMessage logMessage = { ICE_ENUM(LogMessageType, TraceMessage), IceUtil::Time::now().toMicroSeconds(), category, message }; _localLogger->trace(category, message); log(logMessage); @@ -666,7 +704,7 @@ LoggerAdminLoggerI::trace(const string& category, const string& message) void LoggerAdminLoggerI::warning(const string& message) { - LogMessage logMessage = { WarningMessage, IceUtil::Time::now().toMicroSeconds(), "", message }; + LogMessage logMessage = { ICE_ENUM(LogMessageType, WarningMessage), IceUtil::Time::now().toMicroSeconds(), "", message }; _localLogger->warning(message); log(logMessage); @@ -675,7 +713,7 @@ LoggerAdminLoggerI::warning(const string& message) void LoggerAdminLoggerI::error(const string& message) { - LogMessage logMessage = { ErrorMessage, IceUtil::Time::now().toMicroSeconds(), "", message }; + LogMessage logMessage = { ICE_ENUM(LogMessageType, ErrorMessage), IceUtil::Time::now().toMicroSeconds(), "", message }; _localLogger->error(message); log(logMessage); @@ -702,7 +740,7 @@ LoggerAdminLoggerI::getFacet() const void LoggerAdminLoggerI::log(const LogMessage& logMessage) { - const vector remoteLoggers = _loggerAdmin->log(logMessage); + const vector remoteLoggers = _loggerAdmin->log(logMessage); if(!remoteLoggers.empty()) { @@ -710,7 +748,7 @@ LoggerAdminLoggerI::log(const LogMessage& logMessage) if(!_sendLogThread) { - _sendLogThread = new SendLogThread(this); + _sendLogThread = new SendLogThread(ICE_SHARED_FROM_THIS); _sendLogThread->start(); } @@ -755,7 +793,9 @@ LoggerAdminLoggerI::run() trace << "send log thread started"; } +#ifndef ICE_CPP11_MAPPING CallbackPtr logCompletedCb = newCallback(this, &LoggerAdminLoggerI::logCompleted); +#endif for(;;) { @@ -774,7 +814,7 @@ LoggerAdminLoggerI::run() _jobQueue.pop_front(); lock.release(); - for(vector::const_iterator p = job->remoteLoggers.begin(); p != job->remoteLoggers.end(); ++p) + for(vector::const_iterator p = job->remoteLoggers.begin(); p != job->remoteLoggers.end(); ++p) { if(_loggerAdmin->getTraceLevel() > 1) { @@ -784,10 +824,38 @@ LoggerAdminLoggerI::run() try { +#ifdef ICE_CPP11_MAPPING + RemoteLoggerPrxPtr remoteLogger = *p; + remoteLogger->log_async(job->logMessage, + [this, remoteLogger]() + { + if(this->_loggerAdmin->getTraceLevel() > 1) + { + Trace trace(_localLogger, traceCategory); + trace << "log on `" << remoteLogger << "' completed successfully"; + } + }, + [this, remoteLogger](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const CommunicatorDestroyedException&) + { + // expected if there are outstanding calls during communicator destruction + } + catch(const LocalException& ex) + { + this->_loggerAdmin->deadRemoteLogger(remoteLogger, _localLogger, ex, "log"); + } + }); +#else // // *p is a proxy associated with the _sendLogCommunicator // (*p)->begin_log(job->logMessage, logCompletedCb); +#endif } catch(const LocalException& ex) { @@ -803,12 +871,16 @@ LoggerAdminLoggerI::run() } } +#ifndef ICE_CPP11_MAPPING +// +// begin_log callback for C++98 mapping +// void LoggerAdminLoggerI::logCompleted(const AsyncResultPtr& r) { - RemoteLoggerPrx remoteLogger = RemoteLoggerPrx::uncheckedCast(r->getProxy()); - - try + RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy()); + + try { remoteLogger->end_log(r); @@ -827,6 +899,7 @@ LoggerAdminLoggerI::logCompleted(const AsyncResultPtr& r) _loggerAdmin->deadRemoteLogger(remoteLogger, _localLogger, ex, r->getOperation()); } } +#endif // // SendLogThread @@ -852,11 +925,11 @@ SendLogThread::run() namespace IceInternal { -LoggerAdminLoggerPtr -createLoggerAdminLogger(const PropertiesPtr& props, +LoggerAdminLoggerPtr +createLoggerAdminLogger(const PropertiesPtr& props, const LoggerPtr& localLogger) { - return new LoggerAdminLoggerI(props, localLogger); + return ICE_MAKE_SHARED(LoggerAdminLoggerI, props, localLogger); } } diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h index 3d8ce595c53..68796df1ff8 100644 --- a/cpp/src/Ice/LoggerAdminI.h +++ b/cpp/src/Ice/LoggerAdminI.h @@ -34,11 +34,11 @@ public: // Destroy this logger, in particular join any thread // that this logger may have started // - virtual void destroy() = 0; + virtual void destroy() = 0; }; -typedef Handle LoggerAdminLoggerPtr; +ICE_DEFINE_PTR(LoggerAdminLoggerPtr, LoggerAdminLogger); -LoggerAdminLoggerPtr +LoggerAdminLoggerPtr createLoggerAdminLogger(const Ice::PropertiesPtr&, const Ice::LoggerPtr&); } diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp index fcc3ac1d79c..2ecdd689c5e 100644 --- a/cpp/src/Ice/LoggerI.cpp +++ b/cpp/src/Ice/LoggerI.cpp @@ -122,7 +122,7 @@ Ice::LoggerI::getPrefix() LoggerPtr Ice::LoggerI::cloneWithPrefix(const std::string& prefix) { - return new LoggerI(prefix, _file, _convert, _converter); + return ICE_MAKE_SHARED(LoggerI, prefix, _file, _convert, _converter); } void diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h index 441b016a08e..d5d6fb0658f 100644 --- a/cpp/src/Ice/LoggerI.h +++ b/cpp/src/Ice/LoggerI.h @@ -49,8 +49,7 @@ private: #endif }; - -typedef IceUtil::Handle LoggerIPtr; +ICE_DEFINE_PTR(LoggerIPtr, LoggerI); } diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index de6f29a4b6f..6260ba1a674 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -38,7 +38,6 @@ SLICE_OBJS = BuiltinSequences.o \ ObjectAdapter.o \ ObjectAdapterF.o \ ObjectFactory.o \ - ObjectFactoryF.o \ Plugin.o \ PluginF.o \ Process.o \ @@ -142,6 +141,7 @@ OBJS = Acceptor.o \ UdpConnector.o \ UdpEndpointI.o \ UdpTransceiver.o \ + Value.o \ WSAcceptor.o \ WSConnector.o \ WSEndpoint.o \ diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index bdae62218d4..db8cddc15ff 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -38,7 +38,6 @@ SLICE_OBJS = .\BuiltinSequences.obj \ .\ObjectAdapter.obj \ .\ObjectAdapterF.obj \ .\ObjectFactory.obj \ - .\ObjectFactoryF.obj \ .\Plugin.obj \ .\PluginF.obj \ .\Process.obj \ @@ -52,6 +51,7 @@ SLICE_OBJS = .\BuiltinSequences.obj \ .\ServantLocator.obj \ .\ServantLocatorF.obj \ .\SliceChecksumDict.obj \ + .\Value.obj \ .\Version.obj WINDOWS_OBJS = .\DLLMain.obj diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index d6020d3940c..a80e1a7c3ab 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -80,7 +80,7 @@ parseRule(const PropertiesPtr& properties, const string& name) { try { - regexps.push_back(new MetricsMapI::RegExp(p->first.substr(name.length() + 1), p->second)); + regexps.push_back(ICE_MAKE_SHARED(MetricsMapI::RegExp, p->first.substr(name.length() + 1), p->second)); } catch(const std::exception&) { @@ -99,7 +99,7 @@ MetricsMapI::RegExp::RegExp(const string& attribute, const string& regexp) : _at // No regexp support with MinGW, when MinGW C++11 mode is not experimental // we can use std::regex. // -#elif !defined(ICE_CPP11_REGEXP) +#elif !defined(ICE_CPP11_COMPILER_REGEXP) if(regcomp(&_preg, regexp.c_str(), REG_EXTENDED | REG_NOSUB) != 0) { throw SyscallException(__FILE__, __LINE__); @@ -120,7 +120,7 @@ MetricsMapI::RegExp::~RegExp() // No regexp support with MinGW, when MinGW C++11 mode is not experimental // we can use std::regex. // -#elif !defined(ICE_CPP11_REGEXP) +#elif !defined(ICE_CPP11_COMPILER_REGEXP) regfree(&_preg); #endif } @@ -134,7 +134,7 @@ MetricsMapI::RegExp::match(const string& value) // we can use std::regex. // return false; -#elif !defined(ICE_CPP11_REGEXP) +#elif !defined(ICE_CPP11_COMPILER_REGEXP) return regexec(&_preg, value.c_str(), 0, 0, 0) == 0; #else # if _MSC_VER < 1600 @@ -439,7 +439,7 @@ MetricsAdminI::updateViews() map::const_iterator q = _views.find(viewName); if(q == _views.end()) { - q = views.insert(map::value_type(viewName, new MetricsViewI(viewName))).first; + q = views.insert(map::value_type(viewName, ICE_MAKE_SHARED(MetricsViewI, viewName))).first; } else { diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 69a17208243..14086c0d81b 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -19,13 +19,15 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING Object* Ice::upCast(Object* p) { return p; } -void +void Ice::__patch(ObjectPtr& obj, const ObjectPtr& v) { obj = v; } +#endif bool Ice::Object::operator==(const Object& r) const @@ -87,16 +89,6 @@ Ice::Object::ice_clone() const return 0; // avoid warning with some compilers } -void -Ice::Object::ice_preMarshal() -{ -} - -void -Ice::Object::ice_postUnmarshal() -{ -} - DispatchStatus Ice::Object::___ice_isA(Incoming& __inS, const Current& __current) { @@ -142,12 +134,6 @@ Ice::Object::___ice_id(Incoming& __inS, const Current& __current) return DispatchOK; } -Ice::Int -Ice::Object::ice_operationAttributes(const string&) const -{ - return 0; -} - string Ice::Object::__all[] = { @@ -229,6 +215,17 @@ Ice::Object::__dispatch(Incoming& in, const Current& current) throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation); } +#ifndef ICE_CPP11_MAPPING +void +Ice::Object::ice_preMarshal() +{ +} + +void +Ice::Object::ice_postUnmarshal() +{ +} + void Ice::Object::__write(IceInternal::BasicStream* os) const { @@ -266,13 +263,20 @@ Ice::Object::__writeImpl(const OutputStreamPtr&) const { throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support"); } - -void + +void Ice::Object::__readImpl(const InputStreamPtr&) { throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support"); } +Ice::Int +Ice::Object::ice_operationAttributes(const string&) const +{ + return 0; +} +#endif + namespace { @@ -281,19 +285,26 @@ operationModeToString(OperationMode mode) { switch(mode) { - case Normal: + case ICE_ENUM(OperationMode, Normal): return "::Ice::Normal"; - case Nonmutating: + case ICE_ENUM(OperationMode, Nonmutating): return "::Ice::Nonmutating"; - case Idempotent: + case ICE_ENUM(OperationMode, Idempotent): return "::Ice::Idempotent"; } - + // + // This could not happen with C++11 strong type enums + // +#ifndef ICE_CPP11_MAPPING ostringstream os; os << "unknown value (" << mode << ")"; return os.str(); +#else + assert(false); + return ""; +#endif } } @@ -303,12 +314,12 @@ Ice::Object::__checkMode(OperationMode expected, OperationMode received) { if(expected != received) { - if(expected == Idempotent && received == Nonmutating) + if(expected == ICE_ENUM(OperationMode, Idempotent) && received == ICE_ENUM(OperationMode, Nonmutating)) { - // + // // Fine: typically an old client still using the deprecated nonmutating keyword // - + // // Note that expected == Nonmutating and received == Idempotent is not ok: // the server may still use the deprecated nonmutating keyword to detect updates @@ -385,6 +396,10 @@ Ice::BlobjectArray::__dispatch(Incoming& in, const Current& current) DispatchStatus Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current) { +#ifdef ICE_CPP11_MAPPING + // TODO + return DispatchAsync; +#else const Byte* inEncaps; Int sz; in.readParamEncaps(inEncaps, sz); @@ -402,11 +417,16 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current) cb->ice_exception(); } return DispatchAsync; +#endif } DispatchStatus Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current) { +#ifdef ICE_CPP11_MAPPING + // TODO + return DispatchAsync; +#else pair inEncaps; Int sz; in.readParamEncaps(inEncaps.first, sz); @@ -425,16 +445,17 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current) cb->ice_exception(); } return DispatchAsync; +#endif } void -Ice::ice_writeObject(const OutputStreamPtr& out, const ObjectPtr& p) +Ice::ice_writeObject(const OutputStreamPtr& out, const ValuePtr& p) { out->write(p); } void -Ice::ice_readObject(const InputStreamPtr& in, ObjectPtr& p) +Ice::ice_readObject(const InputStreamPtr& in, ValuePtr& p) { in->read(p); } diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index 492ba389f70..66df21a586e 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -18,7 +18,9 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(ObjectAdapterFactory* p) { return p; } +#endif void IceInternal::ObjectAdapterFactory::shutdown() @@ -49,7 +51,11 @@ IceInternal::ObjectAdapterFactory::shutdown() // Deactivate outside the thread synchronization, to avoid // deadlocks. // +#ifdef ICE_CPP11_MAPPING + for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->deactivate(); }); +#else for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::deactivate)); +#endif } void @@ -74,7 +80,11 @@ IceInternal::ObjectAdapterFactory::waitForShutdown() // // Now we wait for deactivation of each object adapter. // +#ifdef ICE_CPP11_MAPPING + for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->waitForDeactivate(); }); +#else for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::waitForDeactivate)); +#endif } bool @@ -103,8 +113,11 @@ IceInternal::ObjectAdapterFactory::destroy() // // Now we destroy each object adapter. // +#ifdef ICE_CPP11_MAPPING + for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->destroy(); }); +#else for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::destroy)); - +#endif { IceUtil::Monitor::Lock sync(*this); _adapters.clear(); @@ -120,12 +133,19 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)()) IceUtil::Monitor::Lock sync(*this); adapters = _adapters; } - +#ifdef ICE_CPP11_MAPPING + for_each(adapters.begin(), adapters.end(), + [fn](const ObjectAdapterIPtr& adapter) + { + (adapter.get() ->* fn)(); + }); +#else for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(fn)); +#endif } ObjectAdapterPtr -IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrx& router) +IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrxPtr& router) { IceUtil::Monitor::Lock sync(*this); @@ -138,8 +158,8 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const if(name.empty()) { string uuid = IceUtil::generateUUID(); - adapter = new ObjectAdapterI(_instance, _communicator, this, uuid, true); - adapter->initialize(0); + adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true); + adapter->initialize(ICE_NULLPTR); } else { @@ -147,7 +167,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const { throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name); } - adapter = new ObjectAdapterI(_instance, _communicator, this, name, false); + adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, name, false); adapter->initialize(router); _adapterNamesInUse.insert(name); } @@ -157,7 +177,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const } ObjectAdapterPtr -IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) +IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrxPtr& proxy) { list adapters; { @@ -165,7 +185,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) if(!_instance) { - return 0; + return ICE_NULLPTR; } adapters = _adapters; @@ -186,7 +206,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) } } - return 0; + return ICE_NULLPTR; } void diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h index 6434a25b178..d9e52a9a7bb 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -19,7 +19,7 @@ namespace IceInternal { -class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::Monitor< ::IceUtil::RecMutex> +class ObjectAdapterFactory : public ICE_ENABLE_SHARED_FROM_THIS(ObjectAdapterFactory), public ::IceUtil::Monitor< ::IceUtil::RecMutex> { public: @@ -30,15 +30,16 @@ public: void updateObservers(void (Ice::ObjectAdapterI::*)()); - ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrx&); - ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&); + ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrxPtr&); + ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrxPtr&); void removeObjectAdapter(const ::Ice::ObjectAdapterPtr&); void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&) const; -private: - ObjectAdapterFactory(const InstancePtr&, const ::Ice::CommunicatorPtr&); virtual ~ObjectAdapterFactory(); + +private: + friend class Instance; InstancePtr _instance; diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 220811dda07..4f30f82b3a5 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -95,8 +95,16 @@ Ice::ObjectAdapterI::activate() // if(_state != StateUninitialized) { +#ifdef ICE_CPP11_MAPPING + for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), + [](const IncomingConnectionFactoryPtr& factory) + { + factory->activate(); + }); +#else for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), Ice::voidMemFun(&IncomingConnectionFactory::activate)); +#endif return; } @@ -148,9 +156,16 @@ Ice::ObjectAdapterI::activate() IceUtil::Monitor::Lock sync(*this); assert(_state == StateActivating); +#ifdef ICE_CPP11_MAPPING + for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), + [](const IncomingConnectionFactoryPtr& factory) + { + factory->activate(); + }); +#else for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), Ice::voidMemFun(&IncomingConnectionFactory::activate)); - +#endif _state = StateActive; notifyAll(); } @@ -164,8 +179,16 @@ Ice::ObjectAdapterI::hold() checkForDeactivation(); _state = StateHeld; +#ifdef ICE_CPP11_MAPPING + for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), + [](const IncomingConnectionFactoryPtr& factory) + { + factory->hold(); + }); +#else for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), Ice::voidMemFun(&IncomingConnectionFactory::hold)); +#endif } void @@ -180,8 +203,16 @@ Ice::ObjectAdapterI::waitForHold() incomingConnectionFactories = _incomingConnectionFactories; } +#ifdef ICE_CPP11_MAPPING + for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(), + [](const IncomingConnectionFactoryPtr& factory) + { + factory->waitUntilHolding(); + }); +#else for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(), Ice::constVoidMemFun(&IncomingConnectionFactory::waitUntilHolding)); +#endif } void @@ -240,15 +271,23 @@ Ice::ObjectAdapterI::deactivate() // Connection::destroy() might block when sending a CloseConnection // message. // +#ifdef ICE_CPP11_MAPPING + for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), + [](const IncomingConnectionFactoryPtr& factory) + { + factory->destroy(); + }); +#else for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), Ice::voidMemFun(&IncomingConnectionFactory::destroy)); +#endif // // Must be called outside the thread synchronization, because // changing the object adapter might block if there are still // requests being dispatched. // - _instance->outgoingConnectionFactory()->removeAdapter(this); + _instance->outgoingConnectionFactory()->removeAdapter(ICE_SHARED_FROM_THIS); { IceUtil::Monitor::Lock sync(*this); @@ -285,8 +324,16 @@ Ice::ObjectAdapterI::waitForDeactivate() // Now we wait until all incoming connection factories are // finished. // +#ifdef ICE_CPP11_MAPPING + for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(), + [](const IncomingConnectionFactoryPtr& factory) + { + factory->waitUntilFinished(); + }); +#else for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(), Ice::voidMemFun(&IncomingConnectionFactory::waitUntilFinished)); +#endif } bool @@ -343,7 +390,7 @@ Ice::ObjectAdapterI::destroy() if(_objectAdapterFactory) { - _objectAdapterFactory->removeObjectAdapter(this); + _objectAdapterFactory->removeObjectAdapter(ICE_SHARED_FROM_THIS); } { @@ -372,13 +419,13 @@ Ice::ObjectAdapterI::destroy() } } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::add(const ObjectPtr& object, const Identity& ident) { return addFacet(object, ident, ""); } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, const string& facet) { IceUtil::Monitor::Lock sync(*this); @@ -392,13 +439,13 @@ Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, co return newProxy(ident, facet); } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::addWithUUID(const ObjectPtr& object) { return addFacetWithUUID(object, ""); } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::addFacetWithUUID(const ObjectPtr& object, const string& facet) { Identity ident; @@ -484,7 +531,7 @@ Ice::ObjectAdapterI::findAllFacets(const Identity& ident) const } ObjectPtr -Ice::ObjectAdapterI::findByProxy(const ObjectPrx& proxy) const +Ice::ObjectAdapterI::findByProxy(const ObjectPrxPtr& proxy) const { IceUtil::Monitor::Lock sync(*this); @@ -534,7 +581,7 @@ Ice::ObjectAdapterI::findServantLocator(const string& prefix) const return _servantManager->findServantLocator(prefix); } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::createProxy(const Identity& ident) const { IceUtil::Monitor::Lock sync(*this); @@ -545,7 +592,7 @@ Ice::ObjectAdapterI::createProxy(const Identity& ident) const return newProxy(ident, ""); } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const { IceUtil::Monitor::Lock sync(*this); @@ -556,7 +603,7 @@ Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const return newDirectProxy(ident, ""); } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const { IceUtil::Monitor::Lock sync(*this); @@ -568,7 +615,7 @@ Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const } void -Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator) +Ice::ObjectAdapterI::setLocator(const LocatorPrxPtr& locator) { IceUtil::Monitor::Lock sync(*this); @@ -577,7 +624,7 @@ Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator) _locatorInfo = _instance->locatorManager()->get(locator); } -LocatorPrx +LocatorPrxPtr Ice::ObjectAdapterI::getLocator() const { IceUtil::Monitor::Lock sync(*this); @@ -635,7 +682,15 @@ Ice::ObjectAdapterI::getEndpoints() const EndpointSeq endpoints; transform(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), - back_inserter(endpoints), Ice::constMemFun(&IncomingConnectionFactory::endpoint)); + back_inserter(endpoints), +#ifdef ICE_CPP11_MAPPING + [](const IncomingConnectionFactoryPtr& factory) + { + return factory->endpoint(); + }); +#else + Ice::constMemFun(&IncomingConnectionFactory::endpoint)); +#endif return endpoints; } @@ -650,7 +705,7 @@ Ice::ObjectAdapterI::getPublishedEndpoints() const } bool -Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const +Ice::ObjectAdapterI::isLocal(const ObjectPrxPtr& proxy) const { // // NOTE: it's important that isLocal() doesn't perform any blocking operations as @@ -752,7 +807,15 @@ Ice::ObjectAdapterI::updateConnectionObservers() IceUtil::Monitor::Lock sync(*this); f = _incomingConnectionFactories; } +#ifdef ICE_CPP11_MAPPING + for_each(f.begin(), f.end(), + [](const IncomingConnectionFactoryPtr& factory) + { + factory->updateConnectionObservers(); + }); +#else for_each(f.begin(), f.end(), Ice::voidMemFun(&IncomingConnectionFactory::updateConnectionObservers)); +#endif } void @@ -842,7 +905,7 @@ Ice::ObjectAdapterI::getACM() const // Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const CommunicatorPtr& communicator, const ObjectAdapterFactoryPtr& objectAdapterFactory, const string& name, - /*const RouterPrx& router,*/ bool noConfig) : + /*const RouterPrxPtr& router,*/ bool noConfig) : _state(StateUninitialized), _instance(instance), _communicator(communicator), @@ -856,7 +919,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica } void -Ice::ObjectAdapterI::initialize(const RouterPrx& router) +Ice::ObjectAdapterI::initialize(const RouterPrxPtr& router) { if(_noConfig) { @@ -944,8 +1007,8 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router) if(!router) { - const_cast(router) = RouterPrx::uncheckedCast( - _instance->proxyFactory()->propertyToProxy(_name + ".Router")); + const_cast(router) = ICE_UNCHECKED_CAST(RouterPrx, + _instance->proxyFactory()->propertyToProxy(_name + ".Router")); } if(router) { @@ -976,7 +1039,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router) // new outgoing connections to the router's client proxy will // use this object adapter for callbacks. // - _routerInfo->setAdapter(this); + _routerInfo->setAdapter(ICE_SHARED_FROM_THIS); // // Also modify all existing outgoing connections to the @@ -996,7 +1059,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router) vector endpoints = parseEndpoints(properties->getProperty(_name + ".Endpoints"), true); for(vector::iterator p = endpoints.begin(); p != endpoints.end(); ++p) { - IncomingConnectionFactoryPtr factory = new IncomingConnectionFactory(_instance, *p, this); + IncomingConnectionFactoryPtr factory = ICE_MAKE_SHARED(IncomingConnectionFactory, _instance, *p, ICE_SHARED_FROM_THIS); factory->initialize(); _incomingConnectionFactories.push_back(factory); } @@ -1019,7 +1082,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router) if(!properties->getProperty(_name + ".Locator").empty()) { - setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Locator"))); + setLocator(ICE_UNCHECKED_CAST(LocatorPrx, _instance->proxyFactory()->propertyToProxy(_name + ".Locator"))); } else { @@ -1054,7 +1117,7 @@ Ice::ObjectAdapterI::~ObjectAdapterI() } } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const { if(_id.empty()) @@ -1071,7 +1134,7 @@ Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const } } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet) const { vector endpoints = _publishedEndpoints; @@ -1090,7 +1153,7 @@ Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet) return _instance->proxyFactory()->referenceToProxy(ref); } -ObjectPrx +ObjectPrxPtr Ice::ObjectAdapterI::newIndirectProxy(const Identity& ident, const string& facet, const string& id) const { // @@ -1238,14 +1301,14 @@ ObjectAdapterI::parsePublishedEndpoints() } void -ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrx& proxy) +ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy) { if(_id.empty() || !locatorInfo) { return; // Nothing to update. } - LocatorRegistryPrx locatorRegistry = locatorInfo->getLocatorRegistry(); + LocatorRegistryPrxPtr locatorRegistry = locatorInfo->getLocatorRegistry(); if(!locatorRegistry) { return; diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 03e389ec0a1..5addbdfe846 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -36,9 +36,11 @@ namespace Ice { class ObjectAdapterI; -typedef IceUtil::Handle ObjectAdapterIPtr; +ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI); -class ObjectAdapterI : public ObjectAdapter, public IceUtil::Monitor +class ObjectAdapterI : public ICE_ENABLE_SHARED_FROM_THIS(ObjectAdapterI), + public ObjectAdapter, + public IceUtil::Monitor { public: @@ -54,10 +56,10 @@ public: virtual bool isDeactivated() const; virtual void destroy(); - virtual ObjectPrx add(const ObjectPtr&, const Identity&); - virtual ObjectPrx addFacet(const ObjectPtr&, const Identity&, const std::string&); - virtual ObjectPrx addWithUUID(const ObjectPtr&); - virtual ObjectPrx addFacetWithUUID(const ObjectPtr&, const std::string&); + virtual ObjectPrxPtr add(const ObjectPtr&, const Identity&); + virtual ObjectPrxPtr addFacet(const ObjectPtr&, const Identity&, const std::string&); + virtual ObjectPrxPtr addWithUUID(const ObjectPtr&); + virtual ObjectPrxPtr addFacetWithUUID(const ObjectPtr&, const std::string&); virtual void addDefaultServant(const ObjectPtr&, const std::string&); virtual ObjectPtr remove(const Identity&); virtual ObjectPtr removeFacet(const Identity&, const std::string&); @@ -66,7 +68,7 @@ public: virtual ObjectPtr find(const Identity&) const; virtual ObjectPtr findFacet(const Identity&, const std::string&) const; virtual FacetMap findAllFacets(const Identity&) const; - virtual ObjectPtr findByProxy(const ObjectPrx&) const; + virtual ObjectPtr findByProxy(const ObjectPrxPtr&) const; virtual ObjectPtr findDefaultServant(const std::string&) const; @@ -74,18 +76,18 @@ public: virtual ServantLocatorPtr removeServantLocator(const std::string&); virtual ServantLocatorPtr findServantLocator(const std::string&) const; - virtual ObjectPrx createProxy(const Identity&) const; - virtual ObjectPrx createDirectProxy(const Identity&) const; - virtual ObjectPrx createIndirectProxy(const Identity&) const; + virtual ObjectPrxPtr createProxy(const Identity&) const; + virtual ObjectPrxPtr createDirectProxy(const Identity&) const; + virtual ObjectPrxPtr createIndirectProxy(const Identity&) const; - virtual void setLocator(const LocatorPrx&); - virtual Ice::LocatorPrx getLocator() const; + virtual void setLocator(const LocatorPrxPtr&); + virtual Ice::LocatorPrxPtr getLocator() const; virtual void refreshPublishedEndpoints(); virtual EndpointSeq getEndpoints() const; virtual EndpointSeq getPublishedEndpoints() const; - bool isLocal(const ObjectPrx&) const; + bool isLocal(const ObjectPrxPtr&) const; void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&); @@ -100,21 +102,22 @@ public: IceInternal::ACMConfig getACM() const; size_t messageSizeMax() const { return _messageSizeMax; } -private: - ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&, const IceInternal::ObjectAdapterFactoryPtr&, const std::string&, bool); virtual ~ObjectAdapterI(); - void initialize(const RouterPrx&); + +private: + + void initialize(const RouterPrxPtr&); friend class IceInternal::ObjectAdapterFactory; - ObjectPrx newProxy(const Identity&, const std::string&) const; - ObjectPrx newDirectProxy(const Identity&, const std::string&) const; - ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const; + ObjectPrxPtr newProxy(const Identity&, const std::string&) const; + ObjectPrxPtr newDirectProxy(const Identity&, const std::string&) const; + ObjectPrxPtr newIndirectProxy(const Identity&, const std::string&, const std::string&) const; void checkForDeactivation() const; std::vector parseEndpoints(const std::string&, bool) const; std::vector parsePublishedEndpoints(); - void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrx&); + void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrxPtr&); bool filterProperties(Ice::StringSeq&); enum State diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp index 835df0b588e..d09ad32afe1 100644 --- a/cpp/src/Ice/ObjectFactoryManager.cpp +++ b/cpp/src/Ice/ObjectFactoryManager.cpp @@ -19,7 +19,7 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(ObjectFactoryManager* p) { return p; } void -IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const string& id) +IceInternal::ObjectFactoryManager::add(const ICE_OBJECT_FACTORY& factory, const string& id) { IceUtil::Mutex::Lock sync(*this); @@ -32,13 +32,13 @@ IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const st throw ex; } - _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair(id, factory)); + _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair(id, factory)); } void IceInternal::ObjectFactoryManager::remove(const string& id) { - ObjectFactoryPtr factory = 0; + ICE_OBJECT_FACTORY factory = ICE_NULLPTR; { IceUtil::Mutex::Lock sync(*this); @@ -81,10 +81,12 @@ IceInternal::ObjectFactoryManager::remove(const string& id) // Destroy outside the lock // assert(factory != 0); +#ifndef ICE_CPP11_MAPPING factory->destroy(); +#endif } -ObjectFactoryPtr +ICE_OBJECT_FACTORY IceInternal::ObjectFactoryManager::find(const string& id) const { IceUtil::Mutex::Lock sync(*this); @@ -112,7 +114,7 @@ IceInternal::ObjectFactoryManager::find(const string& id) const } else { - return 0; + return ICE_NULLPTR; } } @@ -124,6 +126,11 @@ IceInternal::ObjectFactoryManager::ObjectFactoryManager() : 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); @@ -136,4 +143,5 @@ IceInternal::ObjectFactoryManager::destroy() // for_each(oldMap.begin(), oldMap.end(), Ice::secondVoidMemFun(&ObjectFactory::destroy)); +#endif } diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h index 97efc5305ee..c102d276c2c 100644 --- a/cpp/src/Ice/ObjectFactoryManager.h +++ b/cpp/src/Ice/ObjectFactoryManager.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace IceInternal { @@ -22,11 +22,11 @@ class ObjectFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex { public: - void add(const ::Ice::ObjectFactoryPtr&, const std::string&); + void add(const ICE_OBJECT_FACTORY&, const std::string&); + ICE_OBJECT_FACTORY find(const std::string&) const; + typedef std::map FactoryMap; + void remove(const std::string&); - ::Ice::ObjectFactoryPtr find(const std::string&) const; - - typedef std::map FactoryMap; private: diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp index d5604b3d973..9fe1ed7f520 100644 --- a/cpp/src/Ice/ObserverHelper.cpp +++ b/cpp/src/Ice/ObserverHelper.cpp @@ -23,7 +23,7 @@ Ice::Context emptyCtx; } -IceInternal::InvocationObserver::InvocationObserver(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx) +IceInternal::InvocationObserver::InvocationObserver(const Ice::ObjectPrxPtr& proxy, const string& op, const Context* ctx) { const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer; if(!obsv) @@ -53,7 +53,7 @@ IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* insta } void -IceInternal::InvocationObserver::attach(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx) +IceInternal::InvocationObserver::attach(const Ice::ObjectPrxPtr& proxy, const string& op, const Context* ctx) { const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer; if(!obsv) diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp index c061eb0acfa..6a15b5e920c 100644 --- a/cpp/src/Ice/OpaqueEndpointI.cpp +++ b/cpp/src/Ice/OpaqueEndpointI.cpp @@ -107,7 +107,7 @@ IceInternal::OpaqueEndpointI::streamWrite(BasicStream* s) const Ice::EndpointInfoPtr IceInternal::OpaqueEndpointI::getInfo() const { - return new OpaqueEndpointInfoI(_type, _rawEncoding, _rawBytes); + return ICE_MAKE_SHARED(OpaqueEndpointInfoI, _type, _rawEncoding, _rawBytes); } Short @@ -131,7 +131,11 @@ IceInternal::OpaqueEndpointI::timeout() const EndpointIPtr IceInternal::OpaqueEndpointI::timeout(Int) const { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } const string& @@ -143,7 +147,11 @@ IceInternal::OpaqueEndpointI::connectionId() const EndpointIPtr IceInternal::OpaqueEndpointI::connectionId(const string&) const { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } bool @@ -155,7 +163,11 @@ IceInternal::OpaqueEndpointI::compress() const EndpointIPtr IceInternal::OpaqueEndpointI::compress(bool) const { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } bool @@ -173,7 +185,7 @@ IceInternal::OpaqueEndpointI::secure() const TransceiverPtr IceInternal::OpaqueEndpointI::transceiver() const { - return 0; + return ICE_NULLPTR; } void @@ -185,14 +197,18 @@ IceInternal::OpaqueEndpointI::connectors_async(Ice::EndpointSelectionType, const AcceptorPtr IceInternal::OpaqueEndpointI::acceptor(const string&) const { - return 0; + return ICE_NULLPTR; } vector IceInternal::OpaqueEndpointI::expand() const { vector endps; +#ifdef ICE_CPP11_MAPPING + endps.push_back(dynamic_pointer_cast(const_pointer_cast(shared_from_this()))); +#else endps.push_back(const_cast(this)); +#endif return endps; } @@ -231,7 +247,11 @@ IceInternal::OpaqueEndpointI::options() const } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::OpaqueEndpointI::operator==(const EndpointI& r) const +#else IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const +#endif { const OpaqueEndpointI* p = dynamic_cast(&r); if(!p) @@ -263,7 +283,11 @@ IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::OpaqueEndpointI::operator<(const EndpointI& r) const +#else IceInternal::OpaqueEndpointI::operator<(const LocalObject& r) const +#endif { const OpaqueEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h index 9c943c59e59..4ea862d4c30 100644 --- a/cpp/src/Ice/OpaqueEndpointI.h +++ b/cpp/src/Ice/OpaqueEndpointI.h @@ -45,9 +45,13 @@ public: virtual Ice::Int hash() const; virtual std::string options() const; +#ifdef ICE_CPP11_MAPPING + virtual bool operator==(const EndpointI&) const; + virtual bool operator<(const EndpointI&) const; +#else virtual bool operator==(const Ice::LocalObject&) const; virtual bool operator<(const Ice::LocalObject&) const; - +#endif using EndpointI::connectionId; diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 14eb27f7693..2cc2c091ae1 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -26,7 +26,7 @@ OutgoingBase::OutgoingBase(Instance* instance) : _os(instance, Ice::currentProto { } -ProxyOutgoingBase::ProxyOutgoingBase(IceProxy::Ice::Object* proxy, OperationMode mode) : +ProxyOutgoingBase::ProxyOutgoingBase(const Ice::ObjectPrxPtr& proxy, OperationMode mode) : OutgoingBase(proxy->__reference()->getInstance().get()), _proxy(proxy), _mode(mode), @@ -280,7 +280,7 @@ ProxyOutgoingBase::invokeImpl() return false; } -Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) : +Outgoing::Outgoing(const Ice::ObjectPrxPtr& proxy, const string& operation, OperationMode mode, const Context* context) : ProxyOutgoingBase(proxy, mode), _encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())), _is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding), @@ -288,7 +288,6 @@ Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, Operat { checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol())); _observer.attach(proxy, operation, context); - switch(_proxy->__reference()->getMode()) { case Reference::ModeTwoway: @@ -328,7 +327,7 @@ Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, Operat _os.write(static_cast(mode)); - if(context != 0) + if(context != &Ice::noExplicitContext) { // // Explicit context @@ -582,8 +581,8 @@ Outgoing::throwUserException() } } -ProxyFlushBatch::ProxyFlushBatch(IceProxy::Ice::Object* proxy, const string& operation) : - ProxyOutgoingBase(proxy, Ice::Normal) +ProxyFlushBatch::ProxyFlushBatch(const Ice::ObjectPrxPtr& proxy, const string& operation) : + ProxyOutgoingBase(proxy, ICE_ENUM(OperationMode, Normal)) { checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol())); _observer.attach(proxy, operation, 0); diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index ee1e6d5a437..cfe5adda62e 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -22,10 +22,12 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(OutgoingAsyncBase* p) { return p; } IceUtil::Shared* IceInternal::upCast(ProxyOutgoingAsyncBase* p) { return p; } IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; } IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; } +#endif bool OutgoingAsyncBase::sent() @@ -52,12 +54,20 @@ OutgoingAsyncBase::getIs() return 0; // Must be overriden by request that can handle responses } +#ifdef ICE_CPP11_MAPPING +OutgoingAsyncBase::OutgoingAsyncBase(const CommunicatorPtr& communicator, + const InstancePtr& instance, + const string& operation, + const CallbackBasePtr& delegate) : + AsyncResult(communicator, instance, operation, delegate), +#else OutgoingAsyncBase::OutgoingAsyncBase(const CommunicatorPtr& communicator, const InstancePtr& instance, const string& operation, const CallbackBasePtr& delegate, const LocalObjectPtr& cookie) : AsyncResult(communicator, instance, operation, delegate, cookie), +#endif _os(instance.get(), Ice::currentProtocolEncoding) { } @@ -83,7 +93,7 @@ OutgoingAsyncBase::finished(const Exception& ex) return AsyncResult::finished(ex); } -Ice::ObjectPrx +Ice::ObjectPrxPtr ProxyOutgoingAsyncBase::getProxy() const { return _proxy; @@ -101,7 +111,11 @@ ProxyOutgoingAsyncBase::completed(const Exception& exc) _cachedConnection = 0; if(_proxy->__reference()->getInvocationTimeout() == -2) { +#ifdef ICE_CPP11_MAPPING + _instance->timer()->cancel(dynamic_pointer_cast(shared_from_this())); +#else _instance->timer()->cancel(this); +#endif } // @@ -115,7 +129,12 @@ ProxyOutgoingAsyncBase::completed(const Exception& exc) // the retry interval is 0. This method can be called with the // connection locked so we can't just retry here. // +#ifdef ICE_CPP11_MAPPING + _instance->retryQueue()->add(dynamic_pointer_cast(shared_from_this()), + handleException(exc)); +#else _instance->retryQueue()->add(this, handleException(exc)); +#endif return false; } catch(const Exception& ex) @@ -136,7 +155,11 @@ ProxyOutgoingAsyncBase::retryException(const Exception& ex) // connection to be done. // _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and always retry. +#ifdef ICE_CPP11_MAPPING + _instance->retryQueue()->add(dynamic_pointer_cast(shared_from_this()), 0); +#else _instance->retryQueue()->add(this, 0); +#endif } catch(const Ice::Exception& exc) { @@ -155,7 +178,12 @@ ProxyOutgoingAsyncBase::cancelable(const CancellationHandlerPtr& handler) const int timeout = _cachedConnection->timeout(); if(timeout > 0) { +#ifdef ICE_CPP11_MAPPING + _instance->timer()->schedule(dynamic_pointer_cast(shared_from_this()), + IceUtil::Time::milliSeconds(timeout)); +#else _instance->timer()->schedule(this, IceUtil::Time::milliSeconds(timeout)); +#endif } } AsyncResult::cancelable(handler); @@ -187,13 +215,20 @@ ProxyOutgoingAsyncBase::abort(const Ice::Exception& ex) } } -ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrx& prx, +#ifdef ICE_CPP11_MAPPING +ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrxPtr& prx, + const string& operation, + const CallbackBasePtr& delegate) : + OutgoingAsyncBase(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate), +#else +ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrxPtr& prx, const string& operation, const CallbackBasePtr& delegate, const LocalObjectPtr& cookie) : OutgoingAsyncBase(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate, cookie), +#endif _proxy(prx), - _mode(Normal), + _mode(ICE_ENUM(OperationMode, Normal)), _cnt(0), _sent(false) { @@ -209,7 +244,12 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread) int invocationTimeout = _proxy->__reference()->getInvocationTimeout(); if(invocationTimeout > 0) { +#ifdef ICE_CPP11_MAPPING + _instance->timer()->schedule(dynamic_pointer_cast(shared_from_this()), + IceUtil::Time::milliSeconds(invocationTimeout)); +#else _instance->timer()->schedule(this, IceUtil::Time::milliSeconds(invocationTimeout)); +#endif } } else @@ -223,7 +263,12 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread) { _sent = false; _handler = _proxy->__getRequestHandler(); +#ifdef ICE_CPP11_MAPPING + AsyncStatus status = _handler->sendAsyncRequest( + dynamic_pointer_cast(shared_from_this())); +#else AsyncStatus status = _handler->sendAsyncRequest(this); +#endif if(status & AsyncStatusSent) { if(userThread) @@ -258,7 +303,12 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread) int interval = handleException(ex); if(interval > 0) { +#ifdef ICE_CPP11_MAPPING + _instance->retryQueue()->add(dynamic_pointer_cast(shared_from_this()), + interval); +#else _instance->retryQueue()->add(this, interval); +#endif return; } else @@ -293,7 +343,11 @@ ProxyOutgoingAsyncBase::sent(bool done) { if(_proxy->__reference()->getInvocationTimeout() != -1) { - _instance->timer()->cancel(this); +#ifdef ICE_CPP11_MAPPING + _instance->timer()->cancel(dynamic_pointer_cast(shared_from_this())); +#else + _instance->timer()->cancel(this); +#endif } } return OutgoingAsyncBase::sent(done); @@ -304,7 +358,11 @@ ProxyOutgoingAsyncBase::finished(const Exception& ex) { if(_proxy->__reference()->getInvocationTimeout() != -1) { - _instance->timer()->cancel(this); +#ifdef ICE_CPP11_MAPPING + _instance->timer()->cancel(dynamic_pointer_cast(shared_from_this())); +#else + _instance->timer()->cancel(this); +#endif } return OutgoingAsyncBase::finished(ex); } @@ -314,7 +372,11 @@ ProxyOutgoingAsyncBase::finished(bool ok) { if(_proxy->__reference()->getInvocationTimeout() != -1) { - _instance->timer()->cancel(this); +#ifdef ICE_CPP11_MAPPING + _instance->timer()->cancel(dynamic_pointer_cast(shared_from_this())); +#else + _instance->timer()->cancel(this); +#endif } return AsyncResult::finished(ok); } @@ -338,11 +400,18 @@ ProxyOutgoingAsyncBase::runTimerTask() } } -OutgoingAsync::OutgoingAsync(const ObjectPrx& prx, +#ifdef ICE_CPP11_MAPPING +OutgoingAsync::OutgoingAsync(const ObjectPrxPtr& prx, + const string& operation, + const CallbackBasePtr& delegate) : + ProxyOutgoingAsyncBase(prx, operation, delegate), +#else +OutgoingAsync::OutgoingAsync(const ObjectPrxPtr& prx, const string& operation, const CallbackBasePtr& delegate, const LocalObjectPtr& cookie) : ProxyOutgoingAsyncBase(prx, operation, delegate, cookie), +#endif _encoding(getCompatibleEncoding(prx->__reference()->getEncoding())) { } @@ -353,7 +422,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex checkSupportedProtocol(getCompatibleProtocol(_proxy->__reference()->getProtocol())); _mode = mode; - _observer.attach(_proxy.get(), operation, context); + _observer.attach(_proxy, operation, context); switch(_proxy->__reference()->getMode()) { @@ -394,7 +463,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex _os.write(static_cast(_mode)); - if(context != 0) + if(context != &Ice::noExplicitContext) { // // Explicit context @@ -429,7 +498,11 @@ AsyncStatus OutgoingAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool response) { _cachedConnection = connection; +#ifdef ICE_CPP11_MAPPING + return connection->sendAsyncRequest(dynamic_pointer_cast(shared_from_this()), compress, response, 0); +#else return connection->sendAsyncRequest(this, compress, response, 0); +#endif } AsyncStatus @@ -620,13 +693,20 @@ OutgoingAsync::completed() } } -ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrx& proxy, +#ifdef ICE_CPP11_MAPPING +ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrxPtr& proxy, + const string& operation, + const CallbackBasePtr& delegate) : + ProxyOutgoingAsyncBase(proxy, operation, delegate) +#else +ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrxPtr& proxy, const string& operation, const CallbackBasePtr& delegate, const LocalObjectPtr& cookie) : ProxyOutgoingAsyncBase(proxy, operation, delegate, cookie) +#endif { - _observer.attach(proxy.get(), operation, 0); + _observer.attach(proxy, operation, 0); _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os); } @@ -645,7 +725,12 @@ ProxyFlushBatchAsync::invokeRemote(const ConnectionIPtr& connection, bool compre } } _cachedConnection = connection; +#ifdef ICE_CPP11_MAPPING + return connection->sendAsyncRequest(dynamic_pointer_cast(shared_from_this()), + compress, false, _batchRequestNum); +#else return connection->sendAsyncRequest(this, compress, false, _batchRequestNum); +#endif } AsyncStatus @@ -672,13 +757,20 @@ ProxyFlushBatchAsync::invoke() invokeImpl(true); // userThread = true } -ProxyGetConnection::ProxyGetConnection(const ObjectPrx& prx, +#ifdef ICE_CPP11_MAPPING +ProxyGetConnection::ProxyGetConnection(const ObjectPrxPtr& prx, + const string& operation, + const CallbackBasePtr& delegate) : + ProxyOutgoingAsyncBase(prx, operation, delegate) +#else +ProxyGetConnection::ProxyGetConnection(const ObjectPrxPtr& prx, const string& operation, const CallbackBasePtr& delegate, const LocalObjectPtr& cookie) : ProxyOutgoingAsyncBase(prx, operation, delegate, cookie) +#endif { - _observer.attach(prx.get(), operation, 0); + _observer.attach(prx, operation, 0); } AsyncStatus @@ -708,13 +800,23 @@ ProxyGetConnection::invoke() invokeImpl(true); // userThread = true } +#ifdef ICE_CPP11_MAPPING +ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection, + const CommunicatorPtr& communicator, + const InstancePtr& instance, + const string& operation, + const CallbackBasePtr& delegate) : + OutgoingAsyncBase(communicator, instance, operation, delegate), +#else ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection, const CommunicatorPtr& communicator, const InstancePtr& instance, const string& operation, const CallbackBasePtr& delegate, const LocalObjectPtr& cookie) : - OutgoingAsyncBase(communicator, instance, operation, delegate, cookie), _connection(connection) + OutgoingAsyncBase(communicator, instance, operation, delegate, cookie), +#endif + _connection(connection) { _observer.attach(instance.get(), operation); } @@ -742,7 +844,12 @@ ConnectionFlushBatchAsync::invoke() } else { +#ifdef ICE_CPP11_MAPPING + status = _connection->sendAsyncRequest( + dynamic_pointer_cast(shared_from_this()), false, false, batchRequestNum); +#else status = _connection->sendAsyncRequest(this, false, false, batchRequestNum); +#endif } if(status & AsyncStatusSent) @@ -770,12 +877,20 @@ ConnectionFlushBatchAsync::invoke() } } +#ifdef ICE_CPP11_MAPPING +CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const CommunicatorPtr& communicator, + const InstancePtr& instance, + const string& operation, + const CallbackBasePtr& cb) : + AsyncResult(communicator, instance, operation, cb) +#else CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const CommunicatorPtr& communicator, const InstancePtr& instance, const string& operation, const CallbackBasePtr& cb, const LocalObjectPtr& cookie) : AsyncResult(communicator, instance, operation, cb, cookie) +#endif { _observer.attach(instance.get(), operation); @@ -797,7 +912,11 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con) FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync, const InstancePtr& instance, InvocationObserver& observer) : +#ifdef ICE_CPP11_MAPPING + OutgoingAsyncBase(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback), +#else OutgoingAsyncBase(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback, 0), +#endif _outAsync(outAsync), _observer(observer) { @@ -836,7 +955,12 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con) try { +#ifdef ICE_CPP11_MAPPING + auto flushBatch = make_shared( + dynamic_pointer_cast(shared_from_this()), _instance, _observer); +#else OutgoingAsyncBasePtr flushBatch = new FlushBatch(this, _instance, _observer); +#endif int batchRequestNum = con->getBatchRequestQueue()->swap(flushBatch->getOs()); if(batchRequestNum == 0) { @@ -885,3 +1009,248 @@ CommunicatorFlushBatchAsync::check(bool userThread) } } } + +#ifdef ICE_CPP11_MAPPING +OnewayClosureCallback::OnewayClosureCallback( + const string& name, + const shared_ptr& proxy, + function response, + function exception, + function sent) : + __name(name), + __proxy(proxy), + __response(response), + __exception(exception), + __sent(sent) +{ +} + +void +OnewayClosureCallback::sent(const AsyncResultPtr& __result) const +{ + if(__sent) + { + __sent(__result->sentSynchronously()); + } +} + +bool +OnewayClosureCallback::hasSentCallback() const +{ + return __sent != nullptr; +} + +void +OnewayClosureCallback::completed(const AsyncResultPtr& __result) const +{ + try + { + AsyncResult::__check(__result, __proxy.get(), __name); + bool ok = __result->__wait(); + if(__proxy->__reference()->getMode() == Reference::ModeTwoway) + { + if(!ok) + { + try + { + __result->__throwUserException(); + } + catch(const UserException& __ex) + { + throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + } + } + __result->__readEmptyParams(); + if(__response) + { + try + { + __response(); + } + catch(...) + { + throw current_exception(); + } + } + } + } + catch(const exception_ptr& ex) + { + rethrow_exception(ex); + } + catch(const Ice::Exception&) + { + if(__exception) + { + __exception(current_exception()); + } + } +} + +function +OnewayClosureCallback::invoke( + const string& __name, + const shared_ptr& __proxy, + Ice::OperationMode __mode, + Ice::FormatType __format, + function __marshal, + function __response, + function __exception, + function __sent, + const Ice::Context& __context) +{ + auto __result = make_shared(__proxy, __name, + make_shared(__name, __proxy, move(__response), move(__exception), move(__sent))); + try + { + __result->prepare(__name, __mode, &__context); + if(__marshal) + { + __marshal(__result->startWriteParams(__format)); + __result->endWriteParams(); + } + else + { + __result->writeEmptyParams(); + } + __result->invoke(); + } + catch(const exception_ptr& ex) + { + rethrow_exception(ex); + } + catch(const Exception& __ex) + { + __result->abort(__ex); + } + + return [__result]() + { + __result->cancel(); + }; +} + +TwowayClosureCallback::TwowayClosureCallback( + const string& name, + const shared_ptr& proxy, + bool readEmptyParams, + function read, + function userException, + function exception, + function sent) : + __name(name), + __proxy(proxy), + __readEmptyParams(readEmptyParams), + __read(move(read)), + __userException(move(userException)), + __exception(move(exception)), + __sent(move(sent)) +{ +} + +void +TwowayClosureCallback::sent(const AsyncResultPtr& result) const +{ + if(__sent != nullptr) + { + __sent(result->sentSynchronously()); + } +} + +bool +TwowayClosureCallback::hasSentCallback() const +{ + return __sent != nullptr; +} + +void +TwowayClosureCallback::completed(const AsyncResultPtr& __result) const +{ + try + { + AsyncResult::__check(__result, __proxy.get(), __name); + if(!__result->__wait()) + { + try + { + __result->__throwUserException(); + } + catch(const Ice::UserException& __ex) + { + if(__userException) + { + __userException(__ex); + } + throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + } + } + else + { + if(__readEmptyParams) + { + __result->__readEmptyParams(); + __read(0); + } + else + { + __read(__result->__startReadParams()); + } + } + } + catch(const exception_ptr& ex) + { + rethrow_exception(ex); + } + catch(const Ice::Exception&) + { + if(__exception) + { + __exception(current_exception()); + } + } +} + +function +TwowayClosureCallback::invoke( + const string& __name, + const shared_ptr& __proxy, + OperationMode __mode, + FormatType __format, + function __write, + bool __readEmptyParams, + function __read, + function __userException, + function __exception, + function __sent, + const Context& __context) +{ + assert(__proxy); + auto __result = make_shared(__proxy, __name, + make_shared(__name, __proxy, __readEmptyParams, move(__read), + move(__userException), move(__exception), move(__sent))); + __proxy->__checkAsyncTwowayOnly(__name); + try + { + __result->prepare(__name, __mode, &__context); + if(__write) + { + __write(__result->startWriteParams(__format)); + __result->endWriteParams(); + } + else + { + __result->writeEmptyParams(); + } + __result->invoke(); + } + catch(const Exception& __ex) + { + __result->abort(__ex); + } + + return [__result]() + { + __result->cancel(); + }; +} +#endif diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp index e3186298a9c..f0bf409c3f4 100644 --- a/cpp/src/Ice/PluginManagerI.cpp +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -440,7 +440,6 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St cmdArgs = properties->parseCommandLineOptions(name, cmdArgs); } - PluginPtr plugin; PLUGIN_FACTORY factory = 0; DynamicLibraryPtr library; @@ -487,7 +486,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St // Invoke the factory function. No exceptions can be raised // by the factory function because it's declared extern "C". // - plugin = factory(_communicator, name, args); + PluginPtr plugin(factory(_communicator, name, args)); if(!plugin) { PluginInitializationException e(__FILE__, __LINE__); diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h index ef9a1dd9275..97aa03990a6 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -34,10 +34,10 @@ public: virtual PluginPtr getPlugin(const std::string&); virtual void addPlugin(const std::string&, const PluginPtr&); virtual void destroy(); + PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&); private: - PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&); friend class IceInternal::Instance; void loadPlugins(int&, char*[]); diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp index 58095fbf0dc..4cd90f614ba 100644 --- a/cpp/src/Ice/PropertiesAdminI.cpp +++ b/cpp/src/Ice/PropertiesAdminI.cpp @@ -44,8 +44,15 @@ PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&) } void +#ifdef ICE_CPP11_MAPPING +PropertiesAdminI::setProperties_async(const PropertyDict& props, + function response, + function, + const Current&) +#else PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr& cb, const PropertyDict& props, - const Current&) + const Current&) +#endif { Lock sync(*this); @@ -164,7 +171,11 @@ PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr // Send the response now so that we do not block the client during // the call to the update callback. // +#ifdef ICE_CPP11_MAPPING + response(); +#else cb->ice_response(); +#endif // // Copy the callbacks to allow callbacks to update the callbacks. diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h index 46553e06b1d..789a6aee6d5 100644 --- a/cpp/src/Ice/PropertiesAdminI.h +++ b/cpp/src/Ice/PropertiesAdminI.h @@ -27,7 +27,13 @@ public: virtual std::string getProperty(const std::string&, const Ice::Current&); virtual Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&); + +#ifdef ICE_CPP11_MAPPING + virtual void setProperties_async(const ::Ice::PropertyDict&, ::std::function, + ::std::function, const Ice::Current&); +#else virtual void setProperties_async(const Ice::AMD_PropertiesAdmin_setPropertiesPtr&, const Ice::PropertyDict&, const Ice::Current&); +#endif virtual void addUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&); virtual void removeUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&); @@ -38,7 +44,7 @@ private: const Ice::LoggerPtr _logger; std::vector _updateCallbacks; }; -typedef IceUtil::Handle PropertiesAdminIPtr; +ICE_DEFINE_PTR(PropertiesAdminIPtr, PropertiesAdminI); } diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 83c120f5607..136596187c1 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -435,7 +435,7 @@ PropertiesPtr Ice::PropertiesI::clone() { IceUtil::Mutex::Lock sync(*this); - return new PropertiesI(this); + return ICE_MAKE_SHARED(PropertiesI, this); } set diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index d3b1bcee3c5..e4190cdf7da 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -19,10 +19,11 @@ namespace Ice { -class PropertiesI : public Properties, public IceUtil::Mutex +class PropertiesI : public Properties, + public IceUtil::Mutex { public: - + virtual std::string getProperty(const std::string&); virtual std::string getPropertyWithDefault(const std::string&, const std::string&); virtual Ice::Int getPropertyAsInt(const std::string&); @@ -40,10 +41,11 @@ public: std::set getUnusedProperties(); + PropertiesI(const PropertiesI*); + private: PropertiesI(const IceUtil::StringConverterPtr&); PropertiesI(StringSeq&, const PropertiesPtr&, const IceUtil::StringConverterPtr&); - PropertiesI(const PropertiesI*); friend ICE_API PropertiesPtr createProperties(); friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&); diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp index 01f35c19a04..91f07b40ae9 100644 --- a/cpp/src/Ice/Protocol.cpp +++ b/cpp/src/Ice/Protocol.cpp @@ -121,11 +121,11 @@ namespace Ice const EncodingVersion currentEncoding = { IceInternal::encodingMajor, IceInternal::encodingMinor }; const ProtocolVersion currentProtocol = { IceInternal::protocolMajor, IceInternal::protocolMinor }; - // // The encoding to use for protocol messages, this version is tied to // the protocol version. // + const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor, IceInternal::protocolEncodingMinor }; diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 48e85f9dc36..58b91db04ca 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -29,6 +29,11 @@ using namespace std; using namespace Ice; using namespace IceInternal; +namespace Ice +{ +const Context noExplicitContext; +} + namespace { @@ -42,12 +47,487 @@ const string ice_flushBatchRequests_name = "ice_flushBatchRequests"; } -::Ice::ObjectPrx -IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& typeId, const Context* context) +#ifdef ICE_CPP11_MAPPING // C++11 mapping + +bool +Ice::ObjectPrx::operator==(const ObjectPrx& r) const +{ + return _reference == r._reference; +} + +bool +Ice::ObjectPrx::operator!=(const ObjectPrx& r) const +{ + return _reference != r._reference; +} + +bool +Ice::ObjectPrx::operator<(const ObjectPrx& r) const +{ + return _reference < r._reference; +} + +bool +Ice::ObjectPrx::ice_isA(const string& typeId, const ::Ice::Context& context) +{ + promise p; + ice_isA_async(typeId, + [&](bool value) + { + p.set_value(value); + }, + [&](exception_ptr ex) + { + p.set_exception(move(ex)); + }, + nullptr, context); + return p.get_future().get(); +} + +function +Ice::ObjectPrx::ice_isA_async(const string& typeId, + function response, + function exception, + function sent, + const ::Ice::Context& context) +{ + return TwowayClosureCallback::invoke(ice_isA_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, + [&typeId](IceInternal::BasicStream* os) + { + os->write(typeId); + }, + false, + [response = move(response)](IceInternal::BasicStream* is) + { + bool ret; + is->read(ret); + is->endReadEncaps(); + if(response) + { + response(ret); + } + }, + nullptr, move(exception), move(sent), context); +} + +void +Ice::ObjectPrx::ice_ping(const ::Ice::Context& context) +{ + switch(_reference->getMode()) + { + case Reference::ModeTwoway: + { + promise p; + ice_ping_async( + [&]() + { + p.set_value(); + }, + [&](exception_ptr ex) + { + p.set_exception(move(ex)); + }, + nullptr, context); + p.get_future().get(); + break; + } + case Reference::ModeOneway: + case Reference::ModeDatagram: + { + promise p; + ice_ping_async( + nullptr, + [&](exception_ptr ex) + { + p.set_exception(move(ex)); + }, + [&](bool) + { + p.set_value(); + }, + context); + p.get_future().get(); + break; + } + case Reference::ModeBatchOneway: + case Reference::ModeBatchDatagram: + { + ice_ping_async(nullptr, nullptr, nullptr, context); + } + } +} + +function +Ice::ObjectPrx::ice_ping_async(function response, + function exception, + function sent, + const ::Ice::Context& context) +{ + return OnewayClosureCallback::invoke(ice_ping_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, + nullptr, response, exception, sent, context); +} + +string +Ice::ObjectPrx::ice_id(const ::Ice::Context& context) +{ + promise p; + ice_id_async( + [&](string id) + { + p.set_value(move(id)); + }, + [&](exception_ptr ex) + { + p.set_exception(move(ex)); + }, + nullptr, context); + return p.get_future().get(); +} + +function +Ice::ObjectPrx::ice_id_async(function response, + function exception, + function sent, + const ::Ice::Context& context) +{ + return TwowayClosureCallback::invoke( + ice_id_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false, + [response](IceInternal::BasicStream* is) + { + string ret; + is->read(ret); + is->endReadEncaps(); + if(response) + { + response(move(ret)); + } + }, + nullptr, exception, sent, context); +} + + +vector +Ice::ObjectPrx::ice_ids(const ::Ice::Context& context) +{ + promise> p; + ice_ids_async( + [&](vector ids) + { + p.set_value(move(ids)); + }, + [&](exception_ptr ex) + { + p.set_exception(move(ex)); + }, + nullptr, context); + return p.get_future().get(); +} + +function +Ice::ObjectPrx::ice_ids_async(function)> response, + function exception, + function sent, + const ::Ice::Context& context) +{ + return TwowayClosureCallback::invoke( + ice_ids_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false, + [response](IceInternal::BasicStream* is) + { + vector ret; + is->read(ret); + is->endReadEncaps(); + if(response) + { + response(move(ret)); + } + }, + nullptr, exception, sent, context); +} + +function +Ice::ObjectPrx::ice_getConnection_async( + function)> response, + function exception) +{ + + class ConnectionCallback : public CallbackBase + { + public: + + ConnectionCallback(function)> response, + function exception, + shared_ptr proxy) : + _response(move(response)), + _exception(move(exception)), + _proxy(move(proxy)) + { + } + + virtual void sent(const AsyncResultPtr&) const {} + + virtual bool hasSentCallback() const + { + return false; + } + + + virtual void + completed(const ::Ice::AsyncResultPtr& result) const + { + shared_ptr<::Ice::Connection> conn; + try + { + AsyncResult::__check(result, _proxy.get(), ice_getConnection_name); + result->__wait(); + conn = _proxy->ice_getCachedConnection(); + } + catch(const ::Ice::Exception&) + { + _exception(current_exception()); + } + + if(_response) + { + _response(move(conn)); + } + } + + private: + + function)> _response; + function _exception; + shared_ptr _proxy; + }; + + + auto result = make_shared(shared_from_this(), ice_getConnection_name, + make_shared(move(response), move(exception), shared_from_this())); + try + { + result->invoke(); + } + catch(const Exception& ex) + { + result->abort(ex); + } + + return [result]() + { + result->cancel(); + }; +} + +void +Ice::ObjectPrx::ice_flushBatchRequests() +{ + promise p; + ice_flushBatchRequests_async( + [&](exception_ptr ex) + { + p.set_exception(ex); + }, + [&](bool) + { + p.set_value(); + }); + p.get_future().get(); +} + +function +Ice::ObjectPrx::ice_flushBatchRequests_async(function exception, function sent) +{ + class FlushBatchRequestsCallback : public CallbackBase + { + public: + + FlushBatchRequestsCallback(function exception, + function sent, + shared_ptr proxy) : + _exception(move(exception)), + _sent(move(sent)), + _proxy(move(proxy)) + { + } + + virtual void sent(const AsyncResultPtr& result) const + { + try + { + AsyncResult::__check(result, _proxy.get(), ice_flushBatchRequests_name); + result->__wait(); + } + catch(const ::Ice::Exception&) + { + _exception(current_exception()); + } + + if(_sent) + { + _sent(result->sentSynchronously()); + } + } + + virtual bool hasSentCallback() const + { + return true; + } + + + virtual void + completed(const ::Ice::AsyncResultPtr&) const + { + } + + private: + + function _exception; + function _sent; + shared_ptr _proxy; + }; + + auto result = make_shared(shared_from_this(), ice_flushBatchRequests_name, + make_shared(exception, sent, shared_from_this())); + try + { + result->invoke(); + } + catch(const Exception& ex) + { + result->abort(ex); + } + return [result]() + { + result->cancel(); + }; +} + +bool +Ice::ObjectPrx::ice_invoke(const string& operation, + ::Ice::OperationMode mode, + const vector<::Ice::Byte>& inParams, + vector<::Ice::Byte>& pOutParams, + const ::Ice::Context& context) +{ + promise p; + ice_invoke_async(operation, mode, inParams, + [&](bool ok, vector<::Ice::Byte> outParams) + { + pOutParams = move(outParams); + p.set_value(ok); + }, + [&](exception_ptr ex) + { + p.set_exception(move(ex)); + }, + nullptr, context); + return p.get_future().get(); +} + +function +Ice::ObjectPrx::ice_invoke_async(const string& operation, ::Ice::OperationMode mode, + const vector<::Ice::Byte>& inEncaps, + function)> response, + function exception, + function sent, + const ::Ice::Context& context) +{ + class InvokeCallback : public CallbackBase + { + public: + + InvokeCallback(function)> response, + function exception, + shared_ptr proxy) : + _response(move(response)), + _exception(move(exception)), + _proxy(move(proxy)) + { + } + + virtual void sent(const AsyncResultPtr&) const {} + + virtual bool hasSentCallback() const + { + return false; + } + + + virtual void + completed(const ::Ice::AsyncResultPtr& result) const + { + try + { + AsyncResult::__check(result, _proxy.get(), ice_invoke_name); + bool ok = result->__wait(); + if(_proxy->_reference->getMode() == Reference::ModeTwoway) + { + const Byte* v; + Int sz; + result->__readParamEncaps(v, sz); + if(_response) + { + _response(ok, vector(v, v + sz)); + } + } + } + catch(const ::Ice::Exception&) + { + _exception(current_exception()); + } + } + + private: + + function)> _response; + function _exception; + shared_ptr _proxy; + }; + + auto result = make_shared(shared_from_this(), ice_invoke_name, + make_shared(move(response), move(exception), shared_from_this())); + try + { + result->prepare(operation, mode, &context); + + pair inPair; + if(inEncaps.empty()) + { + inPair.first = inPair.second = 0; + } + else + { + inPair.first = &inEncaps[0]; + inPair.second = inPair.first + inEncaps.size(); + } + + result->writeParamEncaps(&inEncaps[0], static_cast(inPair.second - inPair.first)); + result->invoke(); + } + catch(const Exception& ex) + { + result->abort(ex); + } + + return [result]() + { + result->cancel(); + }; +} + +shared_ptr +Ice::ObjectPrx::__newInstance() const { - if(b) + return make_shared(); +} + +#else // C++98 mapping + +::Ice::ObjectPrxPtr +IceInternal::checkedCastImpl(const ObjectPrxPtr& b, const string& f, const string& typeId, const Context* context) +{ + if(b != ICE_NULLPTR) { - ObjectPrx bb = b->ice_facet(f); + ObjectPrxPtr bb = b->ice_facet(f); try { if(context == 0 ? bb->ice_isA(typeId) : bb->ice_isA(typeId, *context)) @@ -65,10 +545,10 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& { } } - return 0; + return ICE_NULLPTR; } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER IceInternal::Cpp11FnCallbackNC::Cpp11FnCallbackNC(const ::std::function& excb, const ::std::function& sentcb) : @@ -153,24 +633,6 @@ IceProxy::Ice::Object::operator<(const Object& r) const return _reference < r._reference; } -CommunicatorPtr -IceProxy::Ice::Object::ice_getCommunicator() const -{ - return _reference->getCommunicator(); -} - -string -IceProxy::Ice::Object::ice_toString() const -{ - // - // Returns the stringified proxy. There's no need to convert the - // string to a native string: a stringified proxy only contains - // printable ASCII which is a subset of all native character sets. - // - return _reference->toString(); -} - - bool IceProxy::Ice::Object::ice_isA(const string& typeId, const Context* context) { @@ -227,7 +689,7 @@ IceProxy::Ice::Object::begin_ice_isA(const string& typeId, return __result; } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER Ice::AsyncResultPtr IceProxy::Ice::Object::__begin_ice_isA(const ::std::string& typeId, @@ -838,128 +1300,321 @@ IceProxy::Ice::Object::___end_ice_invoke(pair& outEnca return ok; } -Identity -IceProxy::Ice::Object::ice_getIdentity() const -{ - return _reference->getIdentity(); -} - -ObjectPrx -IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const +::Ice::AsyncResultPtr +IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del, + const ::Ice::LocalObjectPtr& cookie) { - if(newIdentity.name.empty()) + ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie); + try { - throw IllegalIdentityException(__FILE__, __LINE__); + result->invoke(); } - if(newIdentity == _reference->getIdentity()) + catch(const Exception& ex) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + result->abort(ex); } - else - { - ObjectPrx proxy = new Object; - proxy->setup(_reference->changeIdentity(newIdentity)); + return result; +} + +void +IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& result) +{ + AsyncResult::__check(result, this, ice_flushBatchRequests_name); + result->__wait(); +} + +Int +IceProxy::Ice::Object::__hash() const +{ + return _reference->hash(); +} + +void +IceProxy::Ice::Object::__invoke(Outgoing& __og) const +{ + // + // Helper for operations without out/return parameters and user + // exceptions. + // + + bool __ok = __og.invoke(); + if(__og.hasResponse()) + { + if(!__ok) + { + try + { + __og.throwUserException(); + } + catch(const ::Ice::UserException& __ex) + { + ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name()); + throw __uue; + } + } + __og.readEmptyParams(); + } +} + +void +IceProxy::Ice::Object::__end(const ::Ice::AsyncResultPtr& __result, const std::string& operation) const +{ + AsyncResult::__check(__result, this, operation); + bool __ok = __result->__wait(); + if(_reference->getMode() == Reference::ModeTwoway) + { + if(!__ok) + { + try + { + __result->__throwUserException(); + } + catch(const UserException& __ex) + { + throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + } + } + __result->__readEmptyParams(); + } +} + +namespace IceProxy +{ + +namespace Ice +{ + +ostream& +operator<<(ostream& os, const ::IceProxy::Ice::Object& p) +{ + return os << p.ice_toString(); +} + +} + +} + +IceProxy::Ice::Object* +IceProxy::Ice::Object::__newInstance() const +{ + return new Object; +} + +AsyncResultPtr +IceProxy::Ice::Object::begin_ice_getConnectionInternal(const ::IceInternal::CallbackBasePtr& del, + const ::Ice::LocalObjectPtr& cookie) +{ + ProxyGetConnectionPtr result = new ProxyGetConnection(this, ice_getConnection_name, del, cookie); + try + { + result->invoke(); + } + catch(const Exception& ex) + { + result->abort(ex); + } + return result; +} + +ConnectionPtr +IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& __result) +{ + AsyncResult::__check(__result, this, ice_getConnection_name); + __result->__wait(); + return ice_getCachedConnection(); +} + +void +IceProxy::Ice::Object::ice_flushBatchRequests() +{ + ProxyFlushBatch og(ICE_SHARED_FROM_THIS, ice_flushBatchRequests_name); + og.invoke(); +} + +void +IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const +{ + // + // No mutex lock necessary, there is nothing mutable in this operation. + // + if(!ice_isTwoway()) + { + TwowayOnlyException ex(__FILE__, __LINE__); + ex.operation = name; + throw ex; + } +} + +void +Ice::ice_writeObjectPrx(const OutputStreamPtr& out, const ObjectPrxPtr& v) +{ + out->write(v); +} + +void +Ice::ice_readObjectPrx(const InputStreamPtr& in, ObjectPrxPtr& v) +{ + in->read(v); +} + +#endif + +#ifdef ICE_CPP11_MAPPING +# define ICE_OBJECT_PRX Ice::ObjectPrx +# define CONST_POINTER_CAST_OBJECT_PRX const_pointer_cast(shared_from_this()) +#else +# define ICE_OBJECT_PRX IceProxy::Ice::Object +# define CONST_POINTER_CAST_OBJECT_PRX ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)) +#endif + +// +// methods common for both C++11/C++98 mappings +// + +void +ICE_OBJECT_PRX::__checkAsyncTwowayOnly(const string& name) const +{ + // + // No mutex lock necessary, there is nothing mutable in this operation. + // + if(!ice_isTwoway()) + { + throw IceUtil::IllegalArgumentException(__FILE__, + __LINE__, + "`" + name + "' can only be called with a twoway proxy"); + } +} + +Identity +ICE_OBJECT_PRX::ice_getIdentity() const +{ + return _reference->getIdentity(); +} + +ObjectPrxPtr +ICE_OBJECT_PRX::ice_identity(const Identity& newIdentity) const +{ + if(newIdentity.name.empty()) + { + throw IllegalIdentityException(__FILE__, __LINE__); + } + if(newIdentity == _reference->getIdentity()) + { + return CONST_POINTER_CAST_OBJECT_PRX; + } + else + { +#ifdef ICE_CPP11_MAPPING + auto proxy = make_shared(); +#else + ObjectPrxPtr proxy = new IceProxy::Ice::Object; +#endif + proxy->setup(_reference->changeIdentity(newIdentity)); return proxy; } } Context -IceProxy::Ice::Object::ice_getContext() const +ICE_OBJECT_PRX::ice_getContext() const { return _reference->getContext()->getValue(); } -ObjectPrx -IceProxy::Ice::Object::ice_context(const Context& newContext) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_context(const Context& newContext) const { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeContext(newContext)); return proxy; } const string& -IceProxy::Ice::Object::ice_getFacet() const +ICE_OBJECT_PRX::ice_getFacet() const { return _reference->getFacet(); } -ObjectPrx -IceProxy::Ice::Object::ice_facet(const string& newFacet) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_facet(const string& newFacet) const { if(newFacet == _reference->getFacet()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = new Object; +#ifdef ICE_CPP11_MAPPING + auto proxy = make_shared(); +#else + ObjectPrx proxy = new IceProxy::Ice::Object; +#endif proxy->setup(_reference->changeFacet(newFacet)); return proxy; } } string -IceProxy::Ice::Object::ice_getAdapterId() const +ICE_OBJECT_PRX::ice_getAdapterId() const { return _reference->getAdapterId(); } -ObjectPrx -IceProxy::Ice::Object::ice_adapterId(const string& newAdapterId) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_adapterId(const string& newAdapterId) const { if(newAdapterId == _reference->getAdapterId()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeAdapterId(newAdapterId)); return proxy; } } EndpointSeq -IceProxy::Ice::Object::ice_getEndpoints() const +ICE_OBJECT_PRX::ice_getEndpoints() const { vector endpoints = _reference->getEndpoints(); EndpointSeq retSeq; for(vector::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p) { - retSeq.push_back(EndpointPtr::dynamicCast(*p)); + retSeq.push_back(ICE_DYNAMIC_CAST(Endpoint, *p)); } return retSeq; } -ObjectPrx -IceProxy::Ice::Object::ice_endpoints(const EndpointSeq& newEndpoints) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_endpoints(const EndpointSeq& newEndpoints) const { vector endpoints; for(EndpointSeq::const_iterator p = newEndpoints.begin(); p != newEndpoints.end(); ++p) { - endpoints.push_back(EndpointIPtr::dynamicCast(*p)); + endpoints.push_back(ICE_DYNAMIC_CAST(EndpointI, *p)); } if(endpoints == _reference->getEndpoints()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeEndpoints(endpoints)); return proxy; } } Int -IceProxy::Ice::Object::ice_getLocatorCacheTimeout() const +ICE_OBJECT_PRX::ice_getLocatorCacheTimeout() const { return _reference->getLocatorCacheTimeout(); } -ObjectPrx -IceProxy::Ice::Object::ice_locatorCacheTimeout(Int newTimeout) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_locatorCacheTimeout(Int newTimeout) const { if(newTimeout < -1) { @@ -969,196 +1624,204 @@ IceProxy::Ice::Object::ice_locatorCacheTimeout(Int newTimeout) const } if(newTimeout == _reference->getLocatorCacheTimeout()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeLocatorCacheTimeout(newTimeout)); return proxy; } } bool -IceProxy::Ice::Object::ice_isConnectionCached() const +ICE_OBJECT_PRX::ice_isConnectionCached() const { return _reference->getCacheConnection(); } -ObjectPrx -IceProxy::Ice::Object::ice_connectionCached(bool newCache) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_connectionCached(bool newCache) const { if(newCache == _reference->getCacheConnection()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeCacheConnection(newCache)); return proxy; } } EndpointSelectionType -IceProxy::Ice::Object::ice_getEndpointSelection() const +ICE_OBJECT_PRX::ice_getEndpointSelection() const { return _reference->getEndpointSelection(); } -ObjectPrx -IceProxy::Ice::Object::ice_endpointSelection(EndpointSelectionType newType) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_endpointSelection(EndpointSelectionType newType) const { if(newType == _reference->getEndpointSelection()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeEndpointSelection(newType)); return proxy; } } bool -IceProxy::Ice::Object::ice_isSecure() const +ICE_OBJECT_PRX::ice_isSecure() const { return _reference->getSecure(); } -ObjectPrx -IceProxy::Ice::Object::ice_secure(bool b) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_secure(bool b) const { if(b == _reference->getSecure()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeSecure(b)); return proxy; } } ::Ice::EncodingVersion -IceProxy::Ice::Object::ice_getEncodingVersion() const +ICE_OBJECT_PRX::ice_getEncodingVersion() const { return _reference->getEncoding(); } -ObjectPrx -IceProxy::Ice::Object::ice_encodingVersion(const ::Ice::EncodingVersion& encoding) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_encodingVersion(const ::Ice::EncodingVersion& encoding) const { if(encoding == _reference->getEncoding()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeEncoding(encoding)); return proxy; } } bool -IceProxy::Ice::Object::ice_isPreferSecure() const +ICE_OBJECT_PRX::ice_isPreferSecure() const { return _reference->getPreferSecure(); } -ObjectPrx -IceProxy::Ice::Object::ice_preferSecure(bool b) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_preferSecure(bool b) const { if(b == _reference->getPreferSecure()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changePreferSecure(b)); return proxy; } } -RouterPrx -IceProxy::Ice::Object::ice_getRouter() const +RouterPrxPtr +ICE_OBJECT_PRX::ice_getRouter() const { RouterInfoPtr ri = _reference->getRouterInfo(); - return ri ? ri->getRouter() : RouterPrx(); +#ifdef ICE_CPP11_MAPPING + return ri ? ri->getRouter() : nullptr; +#else + return ri ? ri->getRouter() : RouterPrxPtr(); +#endif } -ObjectPrx -IceProxy::Ice::Object::ice_router(const RouterPrx& router) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_router(const RouterPrxPtr& router) const { ReferencePtr ref = _reference->changeRouter(router); if(ref == _reference) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(ref); return proxy; } } -LocatorPrx -IceProxy::Ice::Object::ice_getLocator() const +LocatorPrxPtr +ICE_OBJECT_PRX::ice_getLocator() const { LocatorInfoPtr ri = _reference->getLocatorInfo(); - return ri ? ri->getLocator() : LocatorPrx(); +#ifdef ICE_CPP11_MAPPING + return ri ? ri->getLocator() : nullptr; +#else + return ri ? ri->getLocator() : LocatorPrxPtr(); +#endif } -ObjectPrx -IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_locator(const LocatorPrxPtr& locator) const { ReferencePtr ref = _reference->changeLocator(locator); if(ref == _reference) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(ref); return proxy; } } bool -IceProxy::Ice::Object::ice_isCollocationOptimized() const +ICE_OBJECT_PRX::ice_isCollocationOptimized() const { return _reference->getCollocationOptimized(); } -ObjectPrx -IceProxy::Ice::Object::ice_collocationOptimized(bool b) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_collocationOptimized(bool b) const { if(b == _reference->getCollocationOptimized()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeCollocationOptimized(b)); return proxy; } } Int -IceProxy::Ice::Object::ice_getInvocationTimeout() const +ICE_OBJECT_PRX::ice_getInvocationTimeout() const { return _reference->getInvocationTimeout(); } -ObjectPrx -IceProxy::Ice::Object::ice_invocationTimeout(Int newTimeout) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_invocationTimeout(Int newTimeout) const { if(newTimeout < 1 && newTimeout != -1 && newTimeout != -2) { @@ -1168,139 +1831,139 @@ IceProxy::Ice::Object::ice_invocationTimeout(Int newTimeout) const } if(newTimeout == _reference->getInvocationTimeout()) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeInvocationTimeout(newTimeout)); return proxy; } } -ObjectPrx -IceProxy::Ice::Object::ice_twoway() const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_twoway() const { if(_reference->getMode() == Reference::ModeTwoway) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeMode(Reference::ModeTwoway)); return proxy; } } bool -IceProxy::Ice::Object::ice_isTwoway() const +ICE_OBJECT_PRX::ice_isTwoway() const { return _reference->getMode() == Reference::ModeTwoway; } -ObjectPrx -IceProxy::Ice::Object::ice_oneway() const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_oneway() const { if(_reference->getMode() == Reference::ModeOneway) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeMode(Reference::ModeOneway)); return proxy; } } bool -IceProxy::Ice::Object::ice_isOneway() const +ICE_OBJECT_PRX::ice_isOneway() const { return _reference->getMode() == Reference::ModeOneway; } -ObjectPrx -IceProxy::Ice::Object::ice_batchOneway() const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_batchOneway() const { if(_reference->getMode() == Reference::ModeBatchOneway) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeMode(Reference::ModeBatchOneway)); return proxy; } } bool -IceProxy::Ice::Object::ice_isBatchOneway() const +ICE_OBJECT_PRX::ice_isBatchOneway() const { return _reference->getMode() == Reference::ModeBatchOneway; } -ObjectPrx -IceProxy::Ice::Object::ice_datagram() const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_datagram() const { if(_reference->getMode() == Reference::ModeDatagram) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeMode(Reference::ModeDatagram)); return proxy; } } bool -IceProxy::Ice::Object::ice_isDatagram() const +ICE_OBJECT_PRX::ice_isDatagram() const { return _reference->getMode() == Reference::ModeDatagram; } -ObjectPrx -IceProxy::Ice::Object::ice_batchDatagram() const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_batchDatagram() const { if(_reference->getMode() == Reference::ModeBatchDatagram) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(_reference->changeMode(Reference::ModeBatchDatagram)); return proxy; } } bool -IceProxy::Ice::Object::ice_isBatchDatagram() const +ICE_OBJECT_PRX::ice_isBatchDatagram() const { return _reference->getMode() == Reference::ModeBatchDatagram; } -ObjectPrx -IceProxy::Ice::Object::ice_compress(bool b) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_compress(bool b) const { ReferencePtr ref = _reference->changeCompress(b); if(ref == _reference) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(ref); return proxy; } } -ObjectPrx -IceProxy::Ice::Object::ice_timeout(int t) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_timeout(int t) const { if(t < 1 && t != -1) { @@ -1311,42 +1974,42 @@ IceProxy::Ice::Object::ice_timeout(int t) const ReferencePtr ref = _reference->changeTimeout(t); if(ref == _reference) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(ref); return proxy; } } -ObjectPrx -IceProxy::Ice::Object::ice_connectionId(const string& id) const +ObjectPrxPtr +ICE_OBJECT_PRX::ice_connectionId(const string& id) const { ReferencePtr ref = _reference->changeConnectionId(id); if(ref == _reference) { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); + return CONST_POINTER_CAST_OBJECT_PRX; } else { - ObjectPrx proxy = __newInstance(); + ObjectPrxPtr proxy = __newInstance(); proxy->setup(ref); return proxy; } } string -IceProxy::Ice::Object::ice_getConnectionId() const +ICE_OBJECT_PRX::ice_getConnectionId() const { return _reference->getConnectionId(); } ConnectionPtr -IceProxy::Ice::Object::ice_getConnection() +ICE_OBJECT_PRX::ice_getConnection() { - InvocationObserver observer(this, "ice_getConnection", 0); + InvocationObserver observer(ICE_SHARED_FROM_THIS, "ice_getConnection", 0); int cnt = 0; while(true) { @@ -1364,7 +2027,7 @@ IceProxy::Ice::Object::ice_getConnection() { try { - int interval = __handleException(ex, handler, Idempotent, false, cnt); + int interval = __handleException(ex, handler, ICE_ENUM(OperationMode, Idempotent), false, cnt); observer.retried(); if(interval > 0) { @@ -1380,32 +2043,8 @@ IceProxy::Ice::Object::ice_getConnection() } } -AsyncResultPtr -IceProxy::Ice::Object::begin_ice_getConnectionInternal(const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie) -{ - ProxyGetConnectionPtr result = new ProxyGetConnection(this, ice_getConnection_name, del, cookie); - try - { - result->invoke(); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -ConnectionPtr -IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& __result) -{ - AsyncResult::__check(__result, this, ice_getConnection_name); - __result->__wait(); - return ice_getCachedConnection(); -} - ConnectionPtr -IceProxy::Ice::Object::ice_getCachedConnection() const +ICE_OBJECT_PRX::ice_getCachedConnection() const { RequestHandlerPtr __handler; { @@ -1427,51 +2066,21 @@ IceProxy::Ice::Object::ice_getCachedConnection() const } void -IceProxy::Ice::Object::ice_flushBatchRequests() +ICE_OBJECT_PRX::setup(const ReferencePtr& ref) { - ProxyFlushBatch og(this, ice_flushBatchRequests_name); - og.invoke(); -} - -::Ice::AsyncResultPtr -IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie) -{ - ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie); - try - { - result->invoke(); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -void -IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& result) -{ - AsyncResult::__check(result, this, ice_flushBatchRequests_name); - result->__wait(); -} + // + // No need to synchronize "*this", as this operation is only + // called upon initialization. + // -Int -IceProxy::Ice::Object::__hash() const -{ - return _reference->hash(); -} + assert(!_reference); + assert(!_requestHandler); -void -IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from) -{ - IceUtil::Mutex::Lock sync(from->_mutex); - _reference = from->_reference; - _requestHandler = from->_requestHandler; + _reference = ref; } int -IceProxy::Ice::Object::__handleException(const Exception& ex, +ICE_OBJECT_PRX::__handleException(const Exception& ex, const RequestHandlerPtr& handler, OperationMode mode, bool sent, @@ -1496,7 +2105,7 @@ IceProxy::Ice::Object::__handleException(const Exception& ex, // const LocalException* localEx = dynamic_cast(&ex); if(localEx && (!sent || - mode == Nonmutating || mode == Idempotent || + mode == ICE_ENUM(OperationMode, Nonmutating) || mode == ICE_ENUM(OperationMode, Idempotent) || dynamic_cast(&ex) || dynamic_cast(&ex))) { @@ -1519,101 +2128,8 @@ IceProxy::Ice::Object::__handleException(const Exception& ex, return 0; // Keep the compiler happy. } -void -IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const -{ - // - // No mutex lock necessary, there is nothing mutable in this operation. - // - if(!ice_isTwoway()) - { - TwowayOnlyException ex(__FILE__, __LINE__); - ex.operation = name; - throw ex; - } -} - -void -IceProxy::Ice::Object::__checkAsyncTwowayOnly(const string& name) const -{ - // - // No mutex lock necessary, there is nothing mutable in this operation. - // - if(!ice_isTwoway()) - { - throw IceUtil::IllegalArgumentException(__FILE__, - __LINE__, - "`" + name + "' can only be called with a twoway proxy"); - } -} - -void -IceProxy::Ice::Object::__invoke(Outgoing& __og) const -{ - // - // Helper for operations without out/return parameters and user - // exceptions. - // - - bool __ok = __og.invoke(); - if(__og.hasResponse()) - { - if(!__ok) - { - try - { - __og.throwUserException(); - } - catch(const ::Ice::UserException& __ex) - { - ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name()); - throw __uue; - } - } - __og.readEmptyParams(); - } -} - -void -IceProxy::Ice::Object::__end(const ::Ice::AsyncResultPtr& __result, const std::string& operation) const -{ - AsyncResult::__check(__result, this, operation); - bool __ok = __result->__wait(); - if(_reference->getMode() == Reference::ModeTwoway) - { - if(!__ok) - { - try - { - __result->__throwUserException(); - } - catch(const UserException& __ex) - { - throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); - } - } - __result->__readEmptyParams(); - } -} - -namespace IceProxy -{ - -namespace Ice -{ - -ostream& -operator<<(ostream& os, const ::IceProxy::Ice::Object& p) -{ - return os << p.ice_toString(); -} - -} - -} - ::IceInternal::RequestHandlerPtr -IceProxy::Ice::Object::__getRequestHandler() +ICE_OBJECT_PRX::__getRequestHandler() { RequestHandlerPtr handler; if(_reference->getCacheConnection()) @@ -1624,11 +2140,11 @@ IceProxy::Ice::Object::__getRequestHandler() return _requestHandler; } } - return _reference->getRequestHandler(this); + return _reference->getRequestHandler(ICE_SHARED_FROM_THIS); } IceInternal::BatchRequestQueuePtr -IceProxy::Ice::Object::__getBatchRequestQueue() +ICE_OBJECT_PRX::__getBatchRequestQueue() { IceUtil::Mutex::Lock sync(_mutex); if(!_batchRequestQueue) @@ -1639,7 +2155,7 @@ IceProxy::Ice::Object::__getBatchRequestQueue() } ::IceInternal::RequestHandlerPtr -IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler) +ICE_OBJECT_PRX::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler) { if(_reference->getCacheConnection()) { @@ -1654,7 +2170,7 @@ IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPt } void -IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous, +ICE_OBJECT_PRX::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous, const ::IceInternal::RequestHandlerPtr& handler) { if(_reference->getCacheConnection() && previous) @@ -1674,28 +2190,33 @@ IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandle } } -IceProxy::Ice::Object* -IceProxy::Ice::Object::__newInstance() const +void +ICE_OBJECT_PRX::__copyFrom(const ObjectPrxPtr& from) { - return new Object; + IceUtil::Mutex::Lock sync(from->_mutex); + _reference = from->_reference; + _requestHandler = from->_requestHandler; } -void -IceProxy::Ice::Object::setup(const ReferencePtr& ref) +CommunicatorPtr +ICE_OBJECT_PRX::ice_getCommunicator() const +{ + return _reference->getCommunicator(); +} + +string +ICE_OBJECT_PRX::ice_toString() const { // - // No need to synchronize "*this", as this operation is only - // called upon initialization. + // Returns the stringified proxy. There's no need to convert the + // string to a native string: a stringified proxy only contains + // printable ASCII which is a subset of all native character sets. // - - assert(!_reference); - assert(!_requestHandler); - - _reference = ref; + return _reference->toString(); } bool -Ice::proxyIdentityLess(const ObjectPrx& lhs, const ObjectPrx& rhs) +Ice::proxyIdentityLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) { if(!lhs && !rhs) { @@ -1716,7 +2237,7 @@ Ice::proxyIdentityLess(const ObjectPrx& lhs, const ObjectPrx& rhs) } bool -Ice::proxyIdentityEqual(const ObjectPrx& lhs, const ObjectPrx& rhs) +Ice::proxyIdentityEqual(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) { if(!lhs && !rhs) { @@ -1737,7 +2258,7 @@ Ice::proxyIdentityEqual(const ObjectPrx& lhs, const ObjectPrx& rhs) } bool -Ice::proxyIdentityAndFacetLess(const ObjectPrx& lhs, const ObjectPrx& rhs) +Ice::proxyIdentityAndFacetLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) { if(!lhs && !rhs) { @@ -1782,7 +2303,7 @@ Ice::proxyIdentityAndFacetLess(const ObjectPrx& lhs, const ObjectPrx& rhs) } bool -Ice::proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& rhs) +Ice::proxyIdentityAndFacetEqual(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) { if(!lhs && !rhs) { @@ -1815,15 +2336,3 @@ Ice::proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& rhs) return false; } } - -void -Ice::ice_writeObjectPrx(const OutputStreamPtr& out, const ObjectPrx& v) -{ - out->write(v); -} - -void -Ice::ice_readObjectPrx(const InputStreamPtr& in, ObjectPrx& v) -{ - in->read(v); -} diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index c5ab91e336c..018cac70602 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -28,7 +28,7 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(ProxyFactory* p) { return p; } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::stringToProxy(const string& str) const { ReferencePtr ref = _instance->referenceFactory()->create(str, ""); @@ -36,7 +36,7 @@ IceInternal::ProxyFactory::stringToProxy(const string& str) const } string -IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const +IceInternal::ProxyFactory::proxyToString(const ObjectPrxPtr& proxy) const { if(proxy) { @@ -48,7 +48,7 @@ IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const } } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const { string proxy = _instance->initializationData().properties->getProperty(prefix); @@ -57,7 +57,7 @@ IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const } PropertyDict -IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string& prefix) const +IceInternal::ProxyFactory::proxyToProperty(const ObjectPrxPtr& proxy, const string& prefix) const { if(proxy) { @@ -69,7 +69,7 @@ IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string& } } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const { Identity ident; @@ -80,7 +80,7 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const } void -IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s) const +IceInternal::ProxyFactory::proxyToStream(const ObjectPrxPtr& proxy, BasicStream* s) const { if(proxy) { @@ -94,18 +94,18 @@ IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s) } } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const { if(ref) { - ObjectPrx proxy = new ::IceProxy::Ice::Object; + ObjectPrxPtr proxy = ICE_MAKE_SHARED(::IceProxy::Ice::Object); proxy->setup(ref); return proxy; } else { - return 0; + return ICE_NULLPTR; } } diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h index 72202a446db..18a4ae83552 100644 --- a/cpp/src/Ice/ProxyFactory.h +++ b/cpp/src/Ice/ProxyFactory.h @@ -29,16 +29,16 @@ class ProxyFactory : public IceUtil::Shared { public: - Ice::ObjectPrx stringToProxy(const std::string&) const; - std::string proxyToString(const Ice::ObjectPrx&) const; + Ice::ObjectPrxPtr stringToProxy(const std::string&) const; + std::string proxyToString(const Ice::ObjectPrxPtr&) const; - Ice::ObjectPrx propertyToProxy(const std::string&) const; - Ice::PropertyDict proxyToProperty(const Ice::ObjectPrx&, const std::string&) const; + Ice::ObjectPrxPtr propertyToProxy(const std::string&) const; + Ice::PropertyDict proxyToProperty(const Ice::ObjectPrxPtr&, const std::string&) const; - Ice::ObjectPrx streamToProxy(BasicStream*) const; - void proxyToStream(const Ice::ObjectPrx&, BasicStream*) const; + Ice::ObjectPrxPtr streamToProxy(BasicStream*) const; + void proxyToStream(const Ice::ObjectPrxPtr&, BasicStream*) const; - Ice::ObjectPrx referenceToProxy(const ReferencePtr&) const; + Ice::ObjectPrxPtr referenceToProxy(const ReferencePtr&) const; int checkRetryAfterException(const Ice::LocalException&, const ReferencePtr&, int&) const; diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index c461535c33e..e2b36e92ffa 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -27,11 +27,14 @@ #include #include #include +#include + #include #include #include #include +#include using namespace std; using namespace Ice; @@ -376,7 +379,6 @@ IceInternal::Reference::operator==(const Reference& r) const { return false; } - return true; } @@ -654,14 +656,14 @@ IceInternal::FixedReference::changeAdapterId(const string& /*newAdapterId*/) con } ReferencePtr -IceInternal::FixedReference::changeLocator(const LocatorPrx&) const +IceInternal::FixedReference::changeLocator(const LocatorPrxPtr&) const { throw FixedProxyException(__FILE__, __LINE__); return 0; // Keep the compiler happy. } ReferencePtr -IceInternal::FixedReference::changeRouter(const RouterPrx&) const +IceInternal::FixedReference::changeRouter(const RouterPrxPtr&) const { throw FixedProxyException(__FILE__, __LINE__); return 0; // Keep the compiler happy. @@ -753,7 +755,7 @@ IceInternal::FixedReference::toProperty(const string&) const } RequestHandlerPtr -IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) const +IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const { switch(getMode()) { @@ -815,7 +817,7 @@ IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) cons } ReferencePtr ref = const_cast(this); - return proxy->__setRequestHandler(new ConnectionRequestHandler(ref, _fixedConnection, compress)); + return proxy->__setRequestHandler(ICE_MAKE_SHARED(ConnectionRequestHandler, ref, _fixedConnection, compress)); } BatchRequestQueuePtr @@ -1039,7 +1041,7 @@ IceInternal::RoutableReference::changeAdapterId(const string& newAdapterId) cons } ReferencePtr -IceInternal::RoutableReference::changeLocator(const LocatorPrx& newLocator) const +IceInternal::RoutableReference::changeLocator(const LocatorPrxPtr& newLocator) const { LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(newLocator); if(newLocatorInfo == _locatorInfo) @@ -1052,7 +1054,7 @@ IceInternal::RoutableReference::changeLocator(const LocatorPrx& newLocator) cons } ReferencePtr -IceInternal::RoutableReference::changeRouter(const RouterPrx& newRouter) const +IceInternal::RoutableReference::changeRouter(const RouterPrxPtr& newRouter) const { RouterInfoPtr newRouterInfo = getInstance()->routerManager()->get(newRouter); if(newRouterInfo == _routerInfo) @@ -1351,7 +1353,12 @@ IceInternal::RoutableReference::operator==(const Reference& r) const { return false; } +#ifdef ICE_CPP11_MAPPING + if(!equal(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(), + Ice::TargetEquals>())) +#else if(_endpoints != rhs->_endpoints) +#endif { return false; } @@ -1479,7 +1486,12 @@ IceInternal::RoutableReference::operator<(const Reference& r) const { return false; } +#ifdef ICE_CPP11_MAPPING + if(lexicographical_compare(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(), + Ice::TargetLess>())) +#else if(_endpoints < rhs->_endpoints) +#endif { return true; } @@ -1505,7 +1517,7 @@ IceInternal::RoutableReference::clone() const } RequestHandlerPtr -IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrx& proxy) const +IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const { return getInstance()->requestHandlerFactory()->getRequestHandler(const_cast(this), proxy); } @@ -1640,7 +1652,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal vector endpts = endpoints; _reference->applyOverrides(endpts); - _reference->createConnection(endpts, new Callback2(_reference, _callback, cached)); + _reference->createConnection(endpts, ICE_MAKE_SHARED(Callback2, _reference, _callback, cached)); } virtual void diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index a8d1b773c46..d10e2c71c3d 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -36,14 +36,17 @@ class Reference : public IceUtil::Shared { public: - class GetConnectionCallback : virtual public IceUtil::Shared + class GetConnectionCallback +#ifndef ICE_CPP11_MAPPING + : virtual public IceUtil::Shared +#endif { public: virtual void setConnection(const Ice::ConnectionIPtr&, bool) = 0; virtual void setException(const Ice::LocalException&) = 0; }; - typedef IceUtil::Handle GetConnectionCallbackPtr; + ICE_DEFINE_PTR(GetConnectionCallbackPtr, GetConnectionCallback); enum Mode { @@ -95,8 +98,8 @@ public: virtual ReferencePtr changeEndpoints(const std::vector&) const = 0; virtual ReferencePtr changeAdapterId(const std::string&) const = 0; - virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0; - virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0; + virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const = 0; + virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const = 0; virtual ReferencePtr changeCollocationOptimized(bool) const = 0; virtual ReferencePtr changeLocatorCacheTimeout(int) const = 0; virtual ReferencePtr changeCacheConnection(bool) const = 0; @@ -132,7 +135,7 @@ public: // // Get a suitable connection for this reference. // - virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const = 0; + virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const = 0; virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0; virtual bool operator==(const Reference&) const; @@ -190,8 +193,8 @@ public: virtual ReferencePtr changeEndpoints(const std::vector&) const; virtual ReferencePtr changeAdapterId(const std::string&) const; - virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const; - virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const; + virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const; + virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const; virtual ReferencePtr changeCollocationOptimized(bool) const; virtual ReferencePtr changeCacheConnection(bool) const; virtual ReferencePtr changePreferSecure(bool) const; @@ -208,7 +211,7 @@ public: virtual std::string toString() const; virtual Ice::PropertyDict toProperty(const std::string&) const; - virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const; + virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const; virtual BatchRequestQueuePtr getBatchRequestQueue() const; virtual bool operator==(const Reference&) const; @@ -248,8 +251,8 @@ public: virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeEndpoints(const std::vector&) const; virtual ReferencePtr changeAdapterId(const std::string&) const; - virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const; - virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const; + virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const; + virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const; virtual ReferencePtr changeCollocationOptimized(bool) const; virtual ReferencePtr changeCacheConnection(bool) const; virtual ReferencePtr changePreferSecure(bool) const; @@ -272,7 +275,7 @@ public: virtual ReferencePtr clone() const; - virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const; + virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const; virtual BatchRequestQueuePtr getBatchRequestQueue() const; void getConnection(const GetConnectionCallbackPtr&) const; diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index 24c5d1d384b..fd6a833311d 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -660,7 +660,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) } ReferenceFactoryPtr -IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter) +IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrxPtr& defaultRouter) { if(defaultRouter == _defaultRouter) { @@ -673,14 +673,14 @@ IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter) return factory; } -RouterPrx +RouterPrxPtr IceInternal::ReferenceFactory::getDefaultRouter() const { return _defaultRouter; } ReferenceFactoryPtr -IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator) +IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrxPtr& defaultLocator) { if(defaultLocator == _defaultLocator) { @@ -693,7 +693,7 @@ IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocato return factory; } -LocatorPrx +LocatorPrxPtr IceInternal::ReferenceFactory::getDefaultLocator() const { return _defaultLocator; @@ -815,7 +815,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, string property; property = propertyPrefix + ".Locator"; - LocatorPrx locator = LocatorPrx::uncheckedCast(_communicator->propertyToProxy(property)); + LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _communicator->propertyToProxy(property)); if(locator) { if(locator->ice_getEncodingVersion() != encoding) @@ -829,7 +829,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, } property = propertyPrefix + ".Router"; - RouterPrx router = RouterPrx::uncheckedCast(_communicator->propertyToProxy(property)); + RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _communicator->propertyToProxy(property)); if(router) { if(propertyPrefix.size() > 7 && propertyPrefix.substr(propertyPrefix.size() - 7, 7) == ".Router") diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h index 2a38f6d72e1..12c396ee440 100644 --- a/cpp/src/Ice/ReferenceFactory.h +++ b/cpp/src/Ice/ReferenceFactory.h @@ -54,11 +54,11 @@ public: // ReferencePtr create(const ::Ice::Identity&, BasicStream*); - ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrx&); - ::Ice::RouterPrx getDefaultRouter() const; + ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrxPtr&); + ::Ice::RouterPrxPtr getDefaultRouter() const; - ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrx&); - ::Ice::LocatorPrx getDefaultLocator() const; + ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrxPtr&); + ::Ice::LocatorPrxPtr getDefaultLocator() const; private: @@ -72,8 +72,8 @@ private: const InstancePtr _instance; const ::Ice::CommunicatorPtr _communicator; - ::Ice::RouterPrx _defaultRouter; - ::Ice::LocatorPrx _defaultLocator; + ::Ice::RouterPrxPtr _defaultRouter; + ::Ice::LocatorPrxPtr _defaultLocator; }; } diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp index 4cef97a0909..62acf7e4ef3 100644 --- a/cpp/src/Ice/RequestHandler.cpp +++ b/cpp/src/Ice/RequestHandler.cpp @@ -13,8 +13,10 @@ using namespace std; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; } IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; } +#endif RetryException::RetryException(const Ice::LocalException& ex) { diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index 03a55f7773d..cfe7db10845 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -52,7 +52,10 @@ private: IceUtil::UniquePtr _ex; }; -class CancellationHandler : virtual public IceUtil::Shared +class CancellationHandler +#ifndef ICE_CPP11_MAPPING + : virtual public IceUtil::Shared +#endif { public: @@ -63,6 +66,8 @@ public: class RequestHandler : public CancellationHandler { public: + + RequestHandler(const ReferencePtr&); virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&) = 0; @@ -76,7 +81,6 @@ public: protected: - RequestHandler(const ReferencePtr&); const ReferencePtr _reference; const bool _response; }; diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp index 0b2d0ff10ed..029a4001e50 100644 --- a/cpp/src/Ice/RequestHandlerFactory.cpp +++ b/cpp/src/Ice/RequestHandlerFactory.cpp @@ -23,14 +23,14 @@ RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _ins } RequestHandlerPtr -IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrx& proxy) +IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrxPtr& proxy) { if(ref->getCollocationOptimized()) { Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy); if(adapter) { - return proxy->__setRequestHandler(new CollocatedRequestHandler(ref, adapter)); + return proxy->__setRequestHandler(ICE_MAKE_SHARED(CollocatedRequestHandler, ref, adapter)); } } @@ -42,7 +42,7 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr map::iterator p = _handlers.find(ref); if(p == _handlers.end()) { - handler = new ConnectRequestHandler(ref, proxy); + handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy); _handlers.insert(make_pair(ref, handler)); connect = true; } @@ -53,12 +53,16 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr } else { - handler = new ConnectRequestHandler(ref, proxy); + handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy); connect = true; } if(connect) { +#ifdef ICE_CPP11_MAPPING + ref->getConnection(handler); +#else ref->getConnection(handler.get()); +#endif } return proxy->__setRequestHandler(handler->connect(proxy)); } diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h index 6a9aec0114d..3a009e2a3c3 100644 --- a/cpp/src/Ice/RequestHandlerFactory.h +++ b/cpp/src/Ice/RequestHandlerFactory.h @@ -28,7 +28,7 @@ public: RequestHandlerFactory(const InstancePtr&); - RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrx&); + RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrxPtr&); void removeRequestHandler(const ReferencePtr&, const RequestHandlerPtr&); private: diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp index 26ed3f231f8..7693477aef9 100644 --- a/cpp/src/Ice/ResponseHandler.cpp +++ b/cpp/src/Ice/ResponseHandler.cpp @@ -12,9 +12,6 @@ using namespace std; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(ResponseHandler* obj) { return obj; } - -ResponseHandler::~ResponseHandler() -{ -} - +#endif \ No newline at end of file diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h index 23ed39fd70d..0838953bc41 100644 --- a/cpp/src/Ice/ResponseHandler.h +++ b/cpp/src/Ice/ResponseHandler.h @@ -16,18 +16,22 @@ #include #include #include +#include namespace IceInternal { class BasicStream; -class ResponseHandler : virtual public ::IceUtil::Shared +class ResponseHandler : +#ifdef ICE_CPP11_MAPPING + public virtual VirtualShared +#else + public virtual ::IceUtil::Shared +#endif { public: - virtual ~ResponseHandler(); - virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0; virtual void sendNoResponse() = 0; virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0; diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp index 6cf87596708..84a8997bd4a 100644 --- a/cpp/src/Ice/RetryQueue.cpp +++ b/cpp/src/Ice/RetryQueue.cpp @@ -40,7 +40,7 @@ IceInternal::RetryTask::runTimerTask() // (we still need the client thread pool at this point to call // exception callbacks with CommunicatorDestroyedException). // - _queue->remove(this); + _queue->remove(ICE_SHARED_FROM_THIS); } void @@ -52,7 +52,7 @@ IceInternal::RetryTask::requestCanceled(OutgoingBase*, const Ice::LocalException void IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex) { - if(_queue->cancel(this)) + if(_queue->cancel(ICE_SHARED_FROM_THIS)) { if(_instance->traceLevels()->retry >= 1) { @@ -97,7 +97,7 @@ IceInternal::RetryQueue::add(const ProxyOutgoingAsyncBasePtr& out, int interval) { throw CommunicatorDestroyedException(__FILE__, __LINE__); } - RetryTaskPtr task = new RetryTask(_instance, this, out); + RetryTaskPtr task = ICE_MAKE_SHARED(RetryTask, _instance, this, out); out->cancelable(task); // This will throw if the request is canceled. try { diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h index e7d4c62728c..07e5e5ac39e 100644 --- a/cpp/src/Ice/RetryQueue.h +++ b/cpp/src/Ice/RetryQueue.h @@ -21,7 +21,9 @@ namespace IceInternal { -class RetryTask : public IceUtil::TimerTask, public CancellationHandler +class RetryTask : public IceUtil::TimerTask, + public CancellationHandler, + public ICE_ENABLE_SHARED_FROM_THIS(RetryTask) { public: @@ -43,7 +45,7 @@ private: const RetryQueuePtr _queue; const ProxyOutgoingAsyncBasePtr _outAsync; }; -typedef IceUtil::Handle RetryTaskPtr; +ICE_DEFINE_PTR(RetryTaskPtr, RetryTask); class RetryQueue : public IceUtil::Shared, public IceUtil::Monitor { diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index 49f3ac389ed..f0afc392990 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -30,27 +30,29 @@ void IceInternal::RouterManager::destroy() { IceUtil::Mutex::Lock sync(*this); - - for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun(&RouterInfo::destroy)); - +#ifdef ICE_CPP11_MAPPING + for_each(_table.begin(), _table.end(), [](auto it){ it.second->destroy(); }); +#else + for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun(&RouterInfo::destroy)); +#endif _table.clear(); _tableHint = _table.end(); } RouterInfoPtr -IceInternal::RouterManager::get(const RouterPrx& rtr) +IceInternal::RouterManager::get(const RouterPrxPtr& rtr) { if(!rtr) { return 0; } - RouterPrx router = RouterPrx::uncheckedCast(rtr->ice_router(0)); // The router cannot be routed. + RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, rtr->ice_router(0)); // The router cannot be routed. IceUtil::Mutex::Lock sync(*this); - map::iterator p = _table.end(); - + map::iterator p = _table.end(); + if(_tableHint != _table.end()) { if(_tableHint->first == router) @@ -58,7 +60,7 @@ IceInternal::RouterManager::get(const RouterPrx& rtr) p = _tableHint; } } - + if(p == _table.end()) { p = _table.find(router); @@ -66,7 +68,7 @@ IceInternal::RouterManager::get(const RouterPrx& rtr) if(p == _table.end()) { - _tableHint = _table.insert(_tableHint, pair(router, new RouterInfo(router))); + _tableHint = _table.insert(_tableHint, pair(router, new RouterInfo(router))); } else { @@ -77,26 +79,26 @@ IceInternal::RouterManager::get(const RouterPrx& rtr) } RouterInfoPtr -IceInternal::RouterManager::erase(const RouterPrx& rtr) +IceInternal::RouterManager::erase(const RouterPrxPtr& rtr) { RouterInfoPtr info; if(rtr) { - RouterPrx router = RouterPrx::uncheckedCast(rtr->ice_router(0)); // The router cannot be routed. + RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, rtr->ice_router(ICE_NULLPTR)); // The router cannot be routed. IceUtil::Mutex::Lock sync(*this); - map::iterator p = _table.end(); + map::iterator p = _table.end(); if(_tableHint != _table.end() && _tableHint->first == router) { p = _tableHint; _tableHint = _table.end(); } - + if(p == _table.end()) { p = _table.find(router); } - + if(p != _table.end()) { info = p->second; @@ -107,7 +109,7 @@ IceInternal::RouterManager::erase(const RouterPrx& rtr) return info; } -IceInternal::RouterInfo::RouterInfo(const RouterPrx& router) : +IceInternal::RouterInfo::RouterInfo(const RouterPrxPtr& router) : _router(router) { assert(_router); @@ -127,19 +129,31 @@ IceInternal::RouterInfo::destroy() bool IceInternal::RouterInfo::operator==(const RouterInfo& rhs) const { +#ifdef ICE_CPP11_MAPPING + return Ice::targetEquals(_router, rhs._router); +#else return _router == rhs._router; +#endif } bool IceInternal::RouterInfo::operator!=(const RouterInfo& rhs) const { +#ifdef ICE_CPP11_MAPPING + return !Ice::targetEquals(_router, rhs._router); +#else return _router != rhs._router; +#endif } bool IceInternal::RouterInfo::operator<(const RouterInfo& rhs) const { +#ifdef ICE_CPP11_MAPPING + return Ice::targetLess(_router, rhs._router); +#else return _router < rhs._router; +#endif } vector @@ -157,14 +171,14 @@ IceInternal::RouterInfo::getClientEndpoints() } void -IceInternal::RouterInfo::getClientProxyResponse(const Ice::ObjectPrx& proxy, +IceInternal::RouterInfo::getClientProxyResponse(const Ice::ObjectPrxPtr& proxy, const GetClientEndpointsCallbackPtr& callback) { callback->setEndpoints(setClientEndpoints(proxy)); } void -IceInternal::RouterInfo::getClientProxyException(const Ice::Exception& ex, +IceInternal::RouterInfo::getClientProxyException(const Ice::Exception& ex, const GetClientEndpointsCallbackPtr& callback) { callback->setException(dynamic_cast(ex)); @@ -185,10 +199,29 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr& return; } - _router->begin_getClientProxy(newCallback_Router_getClientProxy(this, - &RouterInfo::getClientProxyResponse, +#ifdef ICE_CPP11_MAPPING + _router->getClientProxy_async( + [this, callback](const Ice::ObjectPrxPtr& proxy) + { + this->getClientProxyResponse(proxy, callback); + }, + [this, callback](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const Ice::Exception& ex) + { + this->getClientProxyException(ex, callback); + } + }); +#else + _router->begin_getClientProxy(newCallback_Router_getClientProxy(this, + &RouterInfo::getClientProxyResponse, &RouterInfo::getClientProxyException), callback); +#endif } vector @@ -206,7 +239,7 @@ IceInternal::RouterInfo::getServerEndpoints() } void -IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy) +IceInternal::RouterInfo::addProxy(const ObjectPrxPtr& proxy) { assert(proxy); // Must not be called for null proxies. @@ -240,7 +273,7 @@ IceInternal::RouterInfo::addProxyException(const Ice::Exception& ex, const AddPr } bool -IceInternal::RouterInfo::addProxy(const Ice::ObjectPrx& proxy, const AddProxyCallbackPtr& callback) +IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxyCallbackPtr& callback) { assert(proxy); { @@ -258,11 +291,31 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrx& proxy, const AddProxyCal Ice::ObjectProxySeq proxies; proxies.push_back(proxy); AddProxyCookiePtr cookie = new AddProxyCookie(callback, proxy); + +#ifdef ICE_CPP11_MAPPING + _router->addProxies_async(proxies, + [this, cookie](const Ice::ObjectProxySeq& proxies) + { + this->addProxyResponse(proxies, cookie); + }, + [this, cookie](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const Ice::Exception& ex) + { + this->addProxyException(ex, cookie); + } + }); +#else _router->begin_addProxies(proxies, - newCallback_Router_addProxies(this, - &RouterInfo::addProxyResponse, - &RouterInfo::addProxyException), + newCallback_Router_addProxies(this, + &RouterInfo::addProxyResponse, + &RouterInfo::addProxyException), cookie); +#endif return false; } @@ -288,7 +341,7 @@ IceInternal::RouterInfo::clearCache(const ReferencePtr& ref) } vector -IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy) +IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy) { IceUtil::Mutex::Lock sync(*this); if(_clientEndpoints.empty()) @@ -302,7 +355,7 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy) } else { - Ice::ObjectPrx clientProxy = proxy->ice_router(0); // The client proxy cannot be routed. + Ice::ObjectPrxPtr clientProxy = proxy->ice_router(0); // The client proxy cannot be routed. // // In order to avoid creating a new connection to the router, @@ -322,12 +375,12 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy) vector -IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& /*serverProxy*/) +IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrxPtr& /*serverProxy*/) { IceUtil::Mutex::Lock sync(*this); if(_serverEndpoints.empty()) // Lazy initialization. { - ObjectPrx serverProxy = _router->getServerProxy(); + ObjectPrxPtr serverProxy = _router->getServerProxy(); if(!serverProxy) { throw NoEndpointException(__FILE__, __LINE__); @@ -341,12 +394,12 @@ IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& /*serverProxy* } void -IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrx& proxy, const Ice::ObjectProxySeq& evictedProxies) +IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrxPtr& proxy, const Ice::ObjectProxySeq& evictedProxies) { IceUtil::Mutex::Lock sync(*this); // - // Check if the proxy hasn't already been evicted by a concurrent addProxies call. + // Check if the proxy hasn't already been evicted by a concurrent addProxies call. // If it's the case, don't add it to our local map. // multiset::iterator p = _evictedIdentities.find(proxy->ice_getIdentity()); @@ -362,7 +415,7 @@ IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrx& proxy, const I // _identities.insert(proxy->ice_getIdentity()); } - + // // We also must remove whatever proxies the router evicted. // diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index 848cd7e0e04..9f6a1dbfef2 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -13,12 +13,13 @@ #include #include #include -#include +#include #include #include #include #include #include +#include #include @@ -37,13 +38,21 @@ public: // Returns router info for a given router. Automatically creates // the router info if it doesn't exist yet. // - RouterInfoPtr get(const Ice::RouterPrx&); - RouterInfoPtr erase(const Ice::RouterPrx&); + RouterInfoPtr get(const Ice::RouterPrxPtr&); + RouterInfoPtr erase(const Ice::RouterPrxPtr&); private: - std::map _table; - std::map::iterator _tableHint; +#ifdef ICE_CPP11_MAPPING + using RouterTableMap = std::map, + RouterInfoPtr, + Ice::TargetLess>>; +#else + typedef std::map RouterTableMap; +#endif + + RouterTableMap _table; + RouterTableMap::iterator _tableHint; }; class RouterInfo : public IceUtil::Shared, public IceUtil::Mutex @@ -59,16 +68,19 @@ public: }; typedef IceUtil::Handle GetClientEndpointsCallbackPtr; - class AddProxyCallback : virtual public IceUtil::Shared + class AddProxyCallback +#ifndef ICE_CPP11_MAPPING + : virtual public IceUtil::Shared +#endif { public: virtual void addedProxy() = 0; virtual void setException(const Ice::LocalException&) = 0; }; - typedef IceUtil::Handle AddProxyCallbackPtr; + ICE_DEFINE_PTR(AddProxyCallbackPtr, AddProxyCallback); - RouterInfo(const Ice::RouterPrx&); + RouterInfo(const Ice::RouterPrxPtr&); void destroy(); @@ -76,14 +88,14 @@ public: bool operator!=(const RouterInfo&) const; bool operator<(const RouterInfo&) const; - const Ice::RouterPrx& getRouter() const + const Ice::RouterPrxPtr& getRouter() const { // // No mutex lock necessary, _router is immutable. // return _router; } - void getClientProxyResponse(const Ice::ObjectPrx&, const GetClientEndpointsCallbackPtr&); + void getClientProxyResponse(const Ice::ObjectPrxPtr&, const GetClientEndpointsCallbackPtr&); void getClientProxyException(const Ice::Exception&, const GetClientEndpointsCallbackPtr&); std::vector getClientEndpoints(); void getClientEndpoints(const GetClientEndpointsCallbackPtr&); @@ -93,7 +105,7 @@ public: { public: - AddProxyCookie(const AddProxyCallbackPtr cb, const Ice::ObjectPrx& proxy) : + AddProxyCookie(const AddProxyCallbackPtr cb, const Ice::ObjectPrxPtr& proxy) : _cb(cb), _proxy(proxy) { @@ -104,7 +116,7 @@ public: return _cb; } - Ice::ObjectPrx proxy() const + Ice::ObjectPrxPtr proxy() const { return _proxy; } @@ -112,14 +124,14 @@ public: private: const AddProxyCallbackPtr _cb; - const Ice::ObjectPrx _proxy; + const Ice::ObjectPrxPtr _proxy; }; typedef IceUtil::Handle AddProxyCookiePtr; void addProxyResponse(const Ice::ObjectProxySeq&, const AddProxyCookiePtr&); void addProxyException(const Ice::Exception&, const AddProxyCookiePtr&); - void addProxy(const Ice::ObjectPrx&); - bool addProxy(const Ice::ObjectPrx&, const AddProxyCallbackPtr&); + void addProxy(const Ice::ObjectPrxPtr&); + bool addProxy(const Ice::ObjectPrxPtr&, const AddProxyCallbackPtr&); void setAdapter(const Ice::ObjectAdapterPtr&); Ice::ObjectAdapterPtr getAdapter() const; @@ -129,13 +141,13 @@ public: // // The following methods need to be public for access by AMI callbacks. // - std::vector setClientEndpoints(const Ice::ObjectPrx&); - std::vector setServerEndpoints(const Ice::ObjectPrx&); - void addAndEvictProxies(const Ice::ObjectPrx&, const Ice::ObjectProxySeq&); + std::vector setClientEndpoints(const Ice::ObjectPrxPtr&); + std::vector setServerEndpoints(const Ice::ObjectPrxPtr&); + void addAndEvictProxies(const Ice::ObjectPrxPtr&, const Ice::ObjectProxySeq&); private: - const Ice::RouterPrx _router; + const Ice::RouterPrxPtr _router; std::vector _clientEndpoints; std::vector _serverEndpoints; Ice::ObjectAdapterPtr _adapter; diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index 1035955b050..094b6f9734e 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -77,11 +77,13 @@ Selector::initialize(EventHandler* handler) ex.error = GetLastError(); throw ex; } - handler->__incRef(); handler->getNativeInfo()->initialize(_handle, reinterpret_cast(handler)); #else +# ifdef ICE_CPP11_MAPPING + EventHandlerPtr h = dynamic_pointer_cast(handler->shared_from_this()); +# else EventHandlerPtr h = handler; - handler->__incRef(); +# endif handler->getNativeInfo()->setCompletedHandler( ref new SocketOperationCompletedHandler( [=](int operation) @@ -117,7 +119,6 @@ Selector::finish(IceInternal::EventHandler* handler) { handler->_registered = SocketOperationNone; handler->_finish = false; // Ensures that finished() is only called once on the event handler. - handler->__decRef(); } void @@ -721,7 +722,12 @@ Selector::finishSelect(vector >& handlers) continue; // Interrupted } +#ifdef ICE_CPP11_MAPPING + map::iterator q = _readyHandlers.find( + dynamic_pointer_cast(p.first->shared_from_this())); +#else map::iterator q = _readyHandlers.find(p.first); +#endif if(q != _readyHandlers.end()) // Handler will be added by the loop below { q->second = p.second; // We just remember which operations are ready here. @@ -831,12 +837,22 @@ Selector::checkReady(EventHandler* handler) { if(handler->_ready & ~handler->_disabled & handler->_registered) { +#ifdef ICE_CPP11_MAPPING + _readyHandlers.insert(make_pair(dynamic_pointer_cast(handler->shared_from_this()), + SocketOperationNone)); +#else _readyHandlers.insert(make_pair(handler, SocketOperationNone)); +#endif wakeup(); } else { +#ifdef ICE_CPP11_MAPPING + map::iterator p = + _readyHandlers.find(dynamic_pointer_cast(handler->shared_from_this())); +#else map::iterator p = _readyHandlers.find(handler); +#endif if(p != _readyHandlers.end()) { _readyHandlers.erase(p); diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index f2be014be70..3ed40a27d6c 100644 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -196,7 +196,7 @@ public: virtual Ice::LoggerPtr cloneWithPrefix(const string& prefix) { - return new SMEventLoggerIWrapper(_logger, prefix); + return ICE_MAKE_SHARED(SMEventLoggerIWrapper, _logger, prefix); } private: @@ -585,10 +585,10 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa // our own logger. // _logger = getProcessLogger(); - if(LoggerIPtr::dynamicCast(_logger)) + if(ICE_DYNAMIC_CAST(LoggerI, _logger)) { string eventLogSource = initData.properties->getPropertyWithDefault("Ice.EventLog.Source", name); - _logger = new SMEventLoggerIWrapper(new SMEventLoggerI(eventLogSource, stringConverter), ""); + _logger = ICE_MAKE_SHARED(SMEventLoggerIWrapper, new SMEventLoggerI(eventLogSource, stringConverter), ""); setProcessLogger(_logger); } @@ -712,14 +712,14 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa if(!_logger) { _logger = getProcessLogger(); - if(LoggerIPtr::dynamicCast(_logger)) + if(ICE_DYNAMIC_CAST(LoggerI, _logger)) { const bool convert = initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 && initData.properties->getProperty("Ice.StdErr").empty(); - _logger = new LoggerI(initData.properties->getProperty("Ice.ProgramName"), "", convert, - IceUtil::getProcessStringConverter()); + _logger = ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert, + IceUtil::getProcessStringConverter()); setProcessLogger(_logger); } } diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index b47da253e7f..d721b1c6c91 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -13,15 +13,19 @@ using namespace std; using namespace Ice; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* Ice::upCast(SliceInfo* p) { return p; } IceUtil::Shared* Ice::upCast(SlicedData* p) { return p; } IceUtil::Shared* Ice::upCast(UnknownSlicedObject* p) { return p; } +#endif Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : slices(seq) { } + +#ifndef ICE_CPP11_MAPPING void Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) { @@ -39,6 +43,7 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) } } } +#endif Ice::UnknownSlicedObject::UnknownSlicedObject(const string& unknownTypeId) : _unknownTypeId(unknownTypeId) { @@ -56,6 +61,7 @@ Ice::UnknownSlicedObject::getSlicedData() const return _slicedData; } +#ifndef ICE_CPP11_MAPPING void Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v) { @@ -64,6 +70,7 @@ Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v) _slicedData->__gcVisitMembers(_v); } } +#endif void Ice::UnknownSlicedObject::__write(IceInternal::BasicStream* __os) const diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp index 050c32c07ce..a44f891972b 100644 --- a/cpp/src/Ice/StreamI.cpp +++ b/cpp/src/Ice/StreamI.cpp @@ -121,10 +121,10 @@ InputStreamI::readAndCheckSeqSize(int minSize) return _is->readAndCheckSeqSize(minSize); } -ObjectPrx +ObjectPrxPtr InputStreamI::readProxy() { - ObjectPrx v; + ObjectPrxPtr v; _is->read(v); return v; } @@ -133,7 +133,7 @@ namespace { void -patchObject(void* addr, const ObjectPtr& v) +patchObject(void* addr, const ValuePtr& v) { ReadObjectCallback* cb = static_cast(addr); assert(cb); @@ -454,7 +454,7 @@ OutputStreamI::communicator() const } void -OutputStreamI::writeObject(const ObjectPtr& v) +OutputStreamI::writeObject(const ValuePtr& v) { _os->write(v); } @@ -466,7 +466,7 @@ OutputStreamI::writeException(const UserException& v) } void -OutputStreamI::writeProxy(const ObjectPrx& v) +OutputStreamI::writeProxy(const ObjectPrxPtr& v) { _os->write(v); } diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h index 11b659a59c7..d2b8fad2c89 100644 --- a/cpp/src/Ice/StreamI.h +++ b/cpp/src/Ice/StreamI.h @@ -41,7 +41,7 @@ public: virtual Int readSize(); virtual Int readAndCheckSeqSize(int); - virtual ObjectPrx readProxy(); + virtual ObjectPrxPtr readProxy(); virtual void readObject(const ReadObjectCallbackPtr&); virtual void throwException(); @@ -125,9 +125,9 @@ public: virtual CommunicatorPtr communicator() const; - virtual void writeObject(const ObjectPtr&); + virtual void writeObject(const ValuePtr&); virtual void writeException(const UserException&); - virtual void writeProxy(const ObjectPrx&); + virtual void writeProxy(const ObjectPrxPtr&); virtual void writeSize(Int); diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp index 0768efc5b77..99e88c7810f 100644 --- a/cpp/src/Ice/SysLoggerI.cpp +++ b/cpp/src/Ice/SysLoggerI.cpp @@ -163,5 +163,5 @@ Ice::SysLoggerI::getPrefix() Ice::LoggerPtr Ice::SysLoggerI::cloneWithPrefix(const string& prefix) { - return new SysLoggerI(prefix, _facility); + return ICE_MAKE_SHARED(SysLoggerI, prefix, _facility); } diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h index c83eab0a435..c7ceb99d9a4 100644 --- a/cpp/src/Ice/SysLoggerI.h +++ b/cpp/src/Ice/SysLoggerI.h @@ -21,6 +21,7 @@ class SysLoggerI : public Logger, public ::IceUtil::Mutex public: SysLoggerI(const std::string&, const std::string&); + SysLoggerI(const std::string&, int); ~SysLoggerI(); virtual void print(const std::string&); @@ -32,8 +33,6 @@ public: private: - SysLoggerI(const std::string&, int); - int _facility; const std::string _prefix; }; diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index 5e744c394bb..b30edcb0be7 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -21,7 +21,9 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(TcpEndpointI* p) { return p; } +#endif extern "C" { @@ -62,7 +64,12 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, Bas EndpointInfoPtr IceInternal::TcpEndpointI::getInfo() const { +#ifdef ICE_CPP11_MAPPING + TCPEndpointInfoPtr info = make_shared>( + dynamic_pointer_cast(const_pointer_cast(shared_from_this()))); +#else TCPEndpointInfoPtr info = new InfoI(const_cast(this)); +#endif fillEndpointInfo(info.get()); return info; } @@ -70,7 +77,12 @@ IceInternal::TcpEndpointI::getInfo() const EndpointInfoPtr IceInternal::TcpEndpointI::getWSInfo(const string& resource) const { +#ifdef ICE_CPP11_MAPPING + WSEndpointInfoPtr info = make_shared>( + dynamic_pointer_cast(const_pointer_cast(shared_from_this()))); +#else WSEndpointInfoPtr info = new InfoI(const_cast(this)); +#endif fillEndpointInfo(info.get()); info->resource = resource; return info; @@ -87,11 +99,15 @@ IceInternal::TcpEndpointI::timeout(Int timeout) const { if(timeout == _timeout) { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } else { - return new TcpEndpointI(_instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress); + return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress); } } @@ -106,11 +122,15 @@ IceInternal::TcpEndpointI::compress(bool compress) const { if(compress == _compress) { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } else { - return new TcpEndpointI(_instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress); + return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress); } } @@ -123,19 +143,23 @@ IceInternal::TcpEndpointI::datagram() const TransceiverPtr IceInternal::TcpEndpointI::transceiver() const { - return 0; + return ICE_NULLPTR; } AcceptorPtr IceInternal::TcpEndpointI::acceptor(const string&) const { +#ifdef ICE_CPP11_MAPPING + return new TcpAcceptor(dynamic_pointer_cast(const_pointer_cast(shared_from_this())), _instance, _host, _port); +#else return new TcpAcceptor(const_cast(this), _instance, _host, _port); +#endif } TcpEndpointIPtr IceInternal::TcpEndpointI::endpoint(const TcpAcceptorPtr& acceptor) const { - return new TcpEndpointI(_instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId, + return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId, _compress); } @@ -171,7 +195,11 @@ IceInternal::TcpEndpointI::options() const } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::TcpEndpointI::operator==(const EndpointI& r) const +#else IceInternal::TcpEndpointI::operator==(const LocalObject& r) const +#endif { if(!IPEndpointI::operator==(r)) { @@ -198,12 +226,15 @@ IceInternal::TcpEndpointI::operator==(const LocalObject& r) const { return false; } - return true; } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::TcpEndpointI::operator<(const EndpointI& r) const +#else IceInternal::TcpEndpointI::operator<(const LocalObject& r) const +#endif { const TcpEndpointI* p = dynamic_cast(&r); if(!p) @@ -330,7 +361,7 @@ IceInternal::TcpEndpointI::createConnector(const Address& address, const Network IPEndpointIPtr IceInternal::TcpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const { - return new TcpEndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress); + return ICE_MAKE_SHARED(TcpEndpointI, _instance, host, port, _sourceAddr, _timeout, connectionId, _compress); } IceInternal::TcpEndpointFactory::TcpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance) @@ -356,7 +387,7 @@ IceInternal::TcpEndpointFactory::protocol() const EndpointIPtr IceInternal::TcpEndpointFactory::create(vector& args, bool oaEndpoint) const { - IPEndpointIPtr endpt = new TcpEndpointI(_instance); + IPEndpointIPtr endpt = ICE_MAKE_SHARED(TcpEndpointI, _instance); endpt->initWithOptions(args, oaEndpoint); return endpt; } @@ -364,7 +395,7 @@ IceInternal::TcpEndpointFactory::create(vector& args, bool oaEndpoint) c EndpointIPtr IceInternal::TcpEndpointFactory::read(BasicStream* s) const { - return new TcpEndpointI(_instance, s); + return ICE_MAKE_SHARED(TcpEndpointI, _instance, s); } void diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index d29498fc181..6c93a1491ec 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -41,9 +41,13 @@ public: virtual AcceptorPtr acceptor(const std::string&) const; virtual std::string options() const; +#ifdef ICE_CPP11_MAPPING + virtual bool operator==(const EndpointI&) const; + virtual bool operator<(const EndpointI&) const; +#else virtual bool operator==(const Ice::LocalObject&) const; virtual bool operator<(const Ice::LocalObject&) const; - +#endif TcpEndpointIPtr endpoint(const TcpAcceptorPtr&) const; using IPEndpointI::connectionId; diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index 7ca16363d83..6e744ff4919 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -103,7 +103,7 @@ IceInternal::TcpTransceiver::toDetailedString() const Ice::ConnectionInfoPtr IceInternal::TcpTransceiver::getInfo() const { - TCPConnectionInfoPtr info = new TCPConnectionInfo(); + TCPConnectionInfoPtr info = ICE_MAKE_SHARED(TCPConnectionInfo); fillConnectionInfo(info); return info; } @@ -111,7 +111,7 @@ IceInternal::TcpTransceiver::getInfo() const Ice::ConnectionInfoPtr IceInternal::TcpTransceiver::getWSInfo(const Ice::HeaderDict& headers) const { - WSConnectionInfoPtr info = new WSConnectionInfo(); + WSConnectionInfoPtr info = ICE_MAKE_SHARED(WSConnectionInfo); fillConnectionInfo(info); info->headers = headers; return info; diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 0de8b971559..95ca1000e7d 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -345,7 +345,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p const_cast(_priority) = properties->getPropertyAsInt("Ice.ThreadPriority"); } - _workQueue = new ThreadPoolWorkQueue(*this); + _workQueue = ICE_MAKE_SHARED(ThreadPoolWorkQueue, *this); _selector.initialize(_workQueue.get()); if(_instance->traceLevels()->threadPool >= 1) @@ -674,7 +674,11 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) if(_nextHandler != _handlers.end()) { current._ioCompleted = false; +#ifdef ICE_CPP11_MAPPING + current._handler = dynamic_pointer_cast(_nextHandler->first->shared_from_this()); +#else current._handler = _nextHandler->first; +#endif current.operation = _nextHandler->second; ++_nextHandler; thread->setState(ThreadStateInUseForIO); @@ -726,10 +730,20 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) { current._ioCompleted = false; #ifdef ICE_OS_WINRT +# ifdef ICE_CPP11_MAPPING + current._handler = dynamic_pointer_cast( + _selector.getNextHandler(current.operation, _threadIdleTime)->shared_from_this()); +# else current._handler = _selector.getNextHandler(current.operation, _threadIdleTime); +# endif #else +# ifdef ICE_CPP11_MAPPING + current._handler = dynamic_pointer_cast(_selector.getNextHandler(current.operation, + current._count, current._error, _threadIdleTime)->shared_from_this()); +# else current._handler = _selector.getNextHandler(current.operation, current._count, current._error, _threadIdleTime); +# endif #endif } catch(const SelectorTimeoutException&) @@ -776,10 +790,20 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) try { #ifdef ICE_OS_WINRT +# ifdef ICE_CPP11_MAPPING + current._handler = dynamic_pointer_cast(_selector.getNextHandler( + current.operation, _serverIdleTime)->shared_from_this()); +# else current._handler = _selector.getNextHandler(current.operation, _serverIdleTime); +# endif #else +# ifdef ICE_CPP11_MAPPING + current._handler = dynamic_pointer_cast(_selector.getNextHandler(current.operation, + current._count, current._error, _serverIdleTime)->shared_from_this()); +# else current._handler = _selector.getNextHandler(current.operation, current._count, current._error, - _serverIdleTime); + _serverIdleTime); +# endif #endif } catch(const SelectorTimeoutException&) diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index f97ff363f1b..c6db0465bee 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -35,7 +35,7 @@ namespace IceInternal class ThreadPoolCurrent; class ThreadPoolWorkQueue; -typedef IceUtil::Handle ThreadPoolWorkQueuePtr; +ICE_DEFINE_PTR(ThreadPoolWorkQueuePtr, ThreadPoolWorkQueue); class ThreadPoolWorkItem : virtual public IceUtil::Shared { diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp index c0c19e7a22b..19f672b1459 100644 --- a/cpp/src/Ice/TraceUtil.cpp +++ b/cpp/src/Ice/TraceUtil.cpp @@ -73,21 +73,21 @@ printRequestHeader(ostream& s, BasicStream& stream) Byte mode; stream.read(mode); s << "\nmode = " << static_cast(mode) << ' '; - switch(mode) + switch(static_cast(mode)) { - case Normal: + case ICE_ENUM(OperationMode, Normal): { s << "(normal)"; break; } - case Nonmutating: + case ICE_ENUM(OperationMode, Nonmutating): { s << "(nonmutating)"; break; } - case Idempotent: + case ICE_ENUM(OperationMode, Idempotent): { s << "(idempotent)"; break; diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp index 019ff02a368..cffe27fb7ec 100644 --- a/cpp/src/Ice/UdpEndpointI.cpp +++ b/cpp/src/Ice/UdpEndpointI.cpp @@ -22,7 +22,9 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(UdpEndpointI* p) { return p; } +#endif extern "C" { @@ -76,7 +78,12 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, Bas EndpointInfoPtr IceInternal::UdpEndpointI::getInfo() const { +#ifdef ICE_CPP11_MAPPING + Ice::UDPEndpointInfoPtr info = make_shared>( + dynamic_pointer_cast(const_pointer_cast(shared_from_this()))); +#else Ice::UDPEndpointInfoPtr info = new InfoI(const_cast(this)); +#endif fillEndpointInfo(info.get()); return info; } @@ -90,7 +97,11 @@ IceInternal::UdpEndpointI::timeout() const EndpointIPtr IceInternal::UdpEndpointI::timeout(Int) const { +#ifdef ICE_CPP11_MAPPING + return const_pointer_cast(shared_from_this()); +#else return const_cast(this); +#endif } bool @@ -104,12 +115,16 @@ IceInternal::UdpEndpointI::compress(bool compress) const { if(compress == _compress) { +#ifdef ICE_CPP11_MAPPING + return const_pointer_cast(shared_from_this()); +#else return const_cast(this); +#endif } else { - return new UdpEndpointI(_instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl, _connect, - _connectionId, compress); + return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl, + _connect, _connectionId, compress); } } @@ -122,7 +137,12 @@ IceInternal::UdpEndpointI::datagram() const TransceiverPtr IceInternal::UdpEndpointI::transceiver() const { +#ifdef ICE_CPP11_MAPPING + return new UdpTransceiver(dynamic_pointer_cast(const_pointer_cast(shared_from_this())), + _instance, _host, _port, _mcastInterface, _connect); +#else return new UdpTransceiver(const_cast(this), _instance, _host, _port, _mcastInterface, _connect); +#endif } AcceptorPtr @@ -134,8 +154,8 @@ IceInternal::UdpEndpointI::acceptor(const string&) const UdpEndpointIPtr IceInternal::UdpEndpointI::endpoint(const UdpTransceiverPtr& transceiver) const { - return new UdpEndpointI(_instance, _host, transceiver->effectivePort(), _sourceAddr, _mcastInterface, _mcastTtl, - _connect, _connectionId, _compress); + return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, transceiver->effectivePort(), _sourceAddr, _mcastInterface, + _mcastTtl, _connect, _connectionId, _compress); } string @@ -175,7 +195,11 @@ IceInternal::UdpEndpointI::options() const } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::UdpEndpointI::operator==(const EndpointI& r) const +#else IceInternal::UdpEndpointI::operator==(const LocalObject& r) const +#endif { if(!IPEndpointI::operator==(r)) { @@ -217,7 +241,11 @@ IceInternal::UdpEndpointI::operator==(const LocalObject& r) const } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::UdpEndpointI::operator<(const EndpointI& r) const +#else IceInternal::UdpEndpointI::operator<(const LocalObject& r) const +#endif { const UdpEndpointI* p = dynamic_cast(&r); if(!p) @@ -406,8 +434,8 @@ IceInternal::UdpEndpointI::createConnector(const Address& address, const Network IPEndpointIPtr IceInternal::UdpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const { - return new UdpEndpointI(_instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect, connectionId, - _compress); + return ICE_MAKE_SHARED(UdpEndpointI, _instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect, + connectionId, _compress); } IceInternal::UdpEndpointFactory::UdpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance) @@ -433,7 +461,7 @@ IceInternal::UdpEndpointFactory::protocol() const EndpointIPtr IceInternal::UdpEndpointFactory::create(vector& args, bool oaEndpoint) const { - IPEndpointIPtr endpt = new UdpEndpointI(_instance); + IPEndpointIPtr endpt = ICE_MAKE_SHARED(UdpEndpointI, _instance); endpt->initWithOptions(args, oaEndpoint); return endpt; } @@ -441,7 +469,7 @@ IceInternal::UdpEndpointFactory::create(vector& args, bool oaEndpoint) c EndpointIPtr IceInternal::UdpEndpointFactory::read(BasicStream* s) const { - return new UdpEndpointI(_instance, s); + return ICE_MAKE_SHARED(UdpEndpointI, _instance, s); } void diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index 30ab27fb51e..66913066c15 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -39,9 +39,14 @@ public: virtual AcceptorPtr acceptor(const std::string&) const; virtual std::string options() const; +#ifdef ICE_CPP11_MAPPING + virtual bool operator==(const EndpointI&) const; + virtual bool operator<(const EndpointI&) const; +#else virtual bool operator==(const Ice::LocalObject&) const; virtual bool operator<(const Ice::LocalObject&) const; - +#endif + UdpEndpointIPtr endpoint(const UdpTransceiverPtr&) const; using IPEndpointI::connectionId; diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index b1b3c8562b6..072fbe52da1 100644 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -821,7 +821,7 @@ IceInternal::UdpTransceiver::toDetailedString() const Ice::ConnectionInfoPtr IceInternal::UdpTransceiver::getInfo() const { - Ice::UDPConnectionInfoPtr info = new Ice::UDPConnectionInfo(); + Ice::UDPConnectionInfoPtr info = ICE_MAKE_SHARED(Ice::UDPConnectionInfo); #if defined(ICE_OS_WINRT) if(isMulticast(_addr) || isAddressValid(_mcastAddr)) { diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp new file mode 100644 index 00000000000..b791bd59d3d --- /dev/null +++ b/cpp/src/Ice/Value.cpp @@ -0,0 +1,69 @@ +// ********************************************************************** +// +// 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 +#include +#include + +#ifdef ICE_CPP11_MAPPING + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +void +Ice::Value::ice_preMarshal() +{ +} + +void +Ice::Value::ice_postUnmarshal() +{ +} + +void +Ice::Value::__write(IceInternal::BasicStream* os) const +{ + os->startWriteObject(0); + __writeImpl(os); + os->endWriteObject(); +} + +void +Ice::Value::__read(IceInternal::BasicStream* is) +{ + is->startReadObject(); + __readImpl(is); + is->endReadObject(false); +} + +namespace +{ + +const string __Ice__Object_ids[] = +{ + "::Ice::Object" +}; + +} + +const string& +Ice::Value::ice_id() const +{ + return __Ice__Object_ids[0]; +} + + +const string& +Ice::Value::ice_staticId() +{ + return __Ice__Object_ids[0]; +} + +#endif diff --git a/cpp/src/Ice/VirtualShared.h b/cpp/src/Ice/VirtualShared.h new file mode 100644 index 00000000000..4de4d0b17bc --- /dev/null +++ b/cpp/src/Ice/VirtualShared.h @@ -0,0 +1,31 @@ +// ********************************************************************** +// +// 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_VIRTUAL_SHARED_H +#define ICE_VIRTUAL_SHARED_H + +#include + +#ifdef ICE_CPP11_MAPPING + +namespace IceInternal +{ + +class VirtualShared : public ::std::enable_shared_from_this +{ +public: + + virtual ~VirtualShared() = default; +}; + +} + +#endif + +#endif diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp index d23b952b6b5..c1f9c520b18 100644 --- a/cpp/src/Ice/WSEndpoint.cpp +++ b/cpp/src/Ice/WSEndpoint.cpp @@ -20,15 +20,20 @@ using namespace std; using namespace Ice; using namespace IceInternal; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceInternal::upCast(WSEndpoint* p) { return p; } +#endif IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, const string& res) : - _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del)), _resource(res) + _instance(instance), + _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del)), + _resource(res) { } IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const EndpointIPtr& del, vector& args) : - _instance(inst), _delegate(IPEndpointIPtr::dynamicCast(del)) + _instance(inst), + _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del)) { initWithOptions(args); @@ -39,7 +44,8 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const Endpo } IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, BasicStream* s) : - _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del)) + _instance(instance), + _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del)) { s->read(const_cast(_resource), false); } @@ -47,8 +53,13 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E Ice::EndpointInfoPtr IceInternal::WSEndpoint::getInfo() const { +#ifdef ICE_CPP11_MAPPING + assert(dynamic_pointer_cast(_delegate)); + return dynamic_pointer_cast(_delegate)->getWSInfo(_resource); +#else assert(dynamic_cast(_delegate.get())); return dynamic_cast(_delegate.get())->getWSInfo(_resource); +#endif } Ice::Short @@ -83,11 +94,15 @@ IceInternal::WSEndpoint::timeout(Int timeout) const { if(timeout == _delegate->timeout()) { +#ifdef ICE_CPP11_MAPPING + return const_pointer_cast(shared_from_this()); +#else return const_cast(this); +#endif } else { - return new WSEndpoint(_instance, _delegate->timeout(timeout), _resource); + return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->timeout(timeout), _resource); } } @@ -102,11 +117,15 @@ IceInternal::WSEndpoint::connectionId(const string& connectionId) const { if(connectionId == _delegate->connectionId()) { +#ifdef ICE_CPP11_MAPPING + return const_pointer_cast(shared_from_this()); +#else return const_cast(this); +#endif } else { - return new WSEndpoint(_instance, _delegate->connectionId(connectionId), _resource); + return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->connectionId(connectionId), _resource); } } @@ -121,11 +140,15 @@ IceInternal::WSEndpoint::compress(bool compress) const { if(compress == _delegate->compress()) { +#ifdef ICE_CPP11_MAPPING + return const_pointer_cast(shared_from_this()); +#else return const_cast(this); +#endif } else { - return new WSEndpoint(_instance, _delegate->compress(compress), _resource); + return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->compress(compress), _resource); } } @@ -184,21 +207,26 @@ IceInternal::WSEndpoint::connectors_async(Ice::EndpointSelectionType selType, const int _port; const string _resource; }; - _delegate->connectors_async(selType, new CallbackI(callback, _instance, _delegate->host(), _delegate->port(), - _resource)); + _delegate->connectors_async(selType, ICE_MAKE_SHARED(CallbackI, callback, _instance, _delegate->host(), + _delegate->port(), _resource)); } AcceptorPtr IceInternal::WSEndpoint::acceptor(const string& adapterName) const { AcceptorPtr delAcc = _delegate->acceptor(adapterName); +#ifdef ICE_CPP11_MAPPING + return new WSAcceptor(dynamic_pointer_cast(const_pointer_cast(shared_from_this())), + _instance, delAcc); +#else return new WSAcceptor(const_cast(this), _instance, delAcc); +#endif } WSEndpointPtr IceInternal::WSEndpoint::endpoint(const EndpointIPtr& delEndp) const { - return new WSEndpoint(_instance, delEndp, _resource); + return ICE_MAKE_SHARED(WSEndpoint, _instance, delEndp, _resource); } vector @@ -207,7 +235,13 @@ IceInternal::WSEndpoint::expand() const vector endps = _delegate->expand(); for(vector::iterator p = endps.begin(); p != endps.end(); ++p) { +#ifdef ICE_CPP11_MAPPING + *p = p->get() == _delegate.get() ? + dynamic_pointer_cast(const_pointer_cast(shared_from_this())) : + make_shared(_instance, *p, _resource); +#else *p = p->get() == _delegate.get() ? const_cast(this) : new WSEndpoint(_instance, *p, _resource); +#endif } return endps; } @@ -265,11 +299,15 @@ IceInternal::WSEndpoint::options() const EndpointIPtr IceInternal::WSEndpoint::delegate() const { - return EndpointIPtr::dynamicCast(_delegate); + return ICE_DYNAMIC_CAST(EndpointI, _delegate); } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::WSEndpoint::operator==(const EndpointI& r) const +#else IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const +#endif { const WSEndpoint* p = dynamic_cast(&r); if(!p) @@ -296,7 +334,11 @@ IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const } bool +#ifdef ICE_CPP11_MAPPING +IceInternal::WSEndpoint::operator<(const EndpointI& r) const +#else IceInternal::WSEndpoint::operator<(const Ice::LocalObject& r) const +#endif { const WSEndpoint* p = dynamic_cast(&r); if(!p) @@ -385,13 +427,13 @@ IceInternal::WSEndpointFactory::protocol() const EndpointIPtr IceInternal::WSEndpointFactory::create(vector& args, bool oaEndpoint) const { - return new WSEndpoint(_instance, _delegate->create(args, oaEndpoint), args); + return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->create(args, oaEndpoint), args); } EndpointIPtr IceInternal::WSEndpointFactory::read(BasicStream* s) const { - return new WSEndpoint(_instance, _delegate->read(s), s); + return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->read(s), s); } void diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h index 6fb08211a84..a5f4a89d09a 100644 --- a/cpp/src/Ice/WSEndpoint.h +++ b/cpp/src/Ice/WSEndpoint.h @@ -65,8 +65,13 @@ public: EndpointIPtr delegate() const; WSEndpointPtr endpoint(const EndpointIPtr&) const; +#ifdef ICE_CPP11_MAPPING + virtual bool operator==(const EndpointI&) const; + virtual bool operator<(const EndpointI&) const; +#else virtual bool operator==(const Ice::LocalObject&) const; virtual bool operator<(const Ice::LocalObject&) const; +#endif protected: diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak index 2d4c6b79cb0..78e071ebc4a 100755 --- a/cpp/src/IceBox/.depend.mak +++ b/cpp/src/IceBox/.depend.mak @@ -28,6 +28,7 @@ Service.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -36,6 +37,7 @@ Service.obj: \ "$(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" \ @@ -72,7 +74,7 @@ Service.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -86,6 +88,7 @@ Service.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -97,7 +100,6 @@ Service.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -120,7 +122,6 @@ Service.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -157,6 +158,7 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -165,6 +167,7 @@ ServiceManagerI.obj: \ "$(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" \ @@ -201,7 +204,7 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -215,6 +218,7 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -226,7 +230,6 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -249,7 +252,6 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -298,6 +300,7 @@ Admin.obj: \ "$(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" \ @@ -306,6 +309,7 @@ Admin.obj: \ "$(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" \ @@ -346,7 +350,7 @@ Admin.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -360,6 +364,7 @@ Admin.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -371,7 +376,6 @@ Admin.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -393,7 +397,6 @@ Admin.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -421,6 +424,7 @@ IceBox.obj: \ "$(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" \ @@ -429,6 +433,7 @@ IceBox.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -463,7 +468,7 @@ IceBox.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -472,13 +477,13 @@ IceBox.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ @@ -505,6 +510,7 @@ Exception.obj: \ "$(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" \ @@ -513,6 +519,7 @@ Exception.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -547,7 +554,7 @@ Exception.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -556,13 +563,13 @@ Exception.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ diff --git a/cpp/src/IceDB/.depend.mak b/cpp/src/IceDB/.depend.mak old mode 100755 new mode 100644 index ee379870c87..c19a4b2cb26 --- a/cpp/src/IceDB/.depend.mak +++ b/cpp/src/IceDB/.depend.mak @@ -25,6 +25,7 @@ IceDB.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -33,6 +34,7 @@ IceDB.obj: \ "$(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" \ @@ -60,7 +62,7 @@ IceDB.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak index f948e02cb91..23f0d4305e8 100755 --- a/cpp/src/IceDiscovery/.depend.mak +++ b/cpp/src/IceDiscovery/.depend.mak @@ -18,6 +18,7 @@ LocatorI.obj: \ "$(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" \ @@ -26,6 +27,7 @@ LocatorI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -60,7 +62,7 @@ LocatorI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -69,6 +71,7 @@ LocatorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -76,8 +79,7 @@ LocatorI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "LookupI.h" \ "IceDiscovery.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -111,6 +113,7 @@ LookupI.obj: \ "$(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" \ @@ -119,6 +122,7 @@ LookupI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -153,7 +157,7 @@ LookupI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -169,6 +173,7 @@ LookupI.obj: \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ @@ -194,8 +199,7 @@ LookupI.obj: \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ PluginI.obj: \ PluginI.cpp \ @@ -232,6 +236,7 @@ PluginI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -239,6 +244,7 @@ PluginI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -267,7 +273,7 @@ PluginI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -280,6 +286,7 @@ PluginI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -291,7 +298,6 @@ PluginI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -313,7 +319,6 @@ PluginI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -341,6 +346,7 @@ IceDiscovery.obj: \ "$(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" \ @@ -349,6 +355,7 @@ IceDiscovery.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -383,7 +390,7 @@ IceDiscovery.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -392,13 +399,13 @@ IceDiscovery.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp index 09e70a0f9b3..196c1dcaa5d 100644 --- a/cpp/src/IceDiscovery/LocatorI.cpp +++ b/cpp/src/IceDiscovery/LocatorI.cpp @@ -26,7 +26,7 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) : void LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, const std::string& adapterId, - const ObjectPrx& proxy, + const ObjectPrxPtr& proxy, const Current&) { Lock sync(*this); @@ -46,7 +46,7 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async( const AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb, const std::string& adapterId, const std::string& replicaGroupId, - const ObjectPrx& proxy, + const ObjectPrxPtr& proxy, const Current&) { Lock sync(*this); @@ -79,13 +79,13 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async( void LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb, const std::string&, - const ProcessPrx&, + const ProcessPrxPtr&, const Current&) { cb->ice_response(); } -Ice::ObjectPrx +Ice::ObjectPrxPtr LocatorRegistryI::findObject(const Ice::Identity& id) const { Lock sync(*this); @@ -94,7 +94,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const return 0; } - Ice::ObjectPrx prx = _wellKnownProxy->ice_identity(id); + Ice::ObjectPrxPtr prx = _wellKnownProxy->ice_identity(id); vector adapterIds; for(map >::const_iterator p = _replicaGroups.begin(); p != _replicaGroups.end(); ++p) @@ -112,7 +112,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const if(adapterIds.empty()) { - for(map::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p) + for(map::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p) { try { @@ -135,12 +135,12 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const return prx->ice_adapterId(adapterIds[0]); } -Ice::ObjectPrx +Ice::ObjectPrxPtr LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) const { Lock sync(*this); - map::const_iterator p = _adapters.find(adapterId); + map::const_iterator p = _adapters.find(adapterId); if(p != _adapters.end()) { isReplicaGroup = false; @@ -151,10 +151,10 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con if(q != _replicaGroups.end()) { Ice::EndpointSeq endpoints; - Ice::ObjectPrx prx; + Ice::ObjectPrxPtr prx; for(set::const_iterator r = q->second.begin(); r != q->second.end(); ++r) { - map::const_iterator s = _adapters.find(*r); + map::const_iterator s = _adapters.find(*r); if(s == _adapters.end()) { continue; // TODO: Inconsistency @@ -180,7 +180,7 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con return 0; } -LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrx& registry) : _lookup(lookup), _registry(registry) +LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrxPtr& registry) : _lookup(lookup), _registry(registry) { } @@ -200,7 +200,7 @@ LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, _lookup->findAdapter(cb, adapterId); } -LocatorRegistryPrx +LocatorRegistryPrxPtr LocatorI::getRegistry(const Current&) const { return _registry; diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h index 6b3428b15c9..230d8c4e7c9 100644 --- a/cpp/src/IceDiscovery/LocatorI.h +++ b/cpp/src/IceDiscovery/LocatorI.h @@ -26,36 +26,36 @@ public: virtual void setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, - const Ice::ObjectPrx&, const Ice::Current&); + const Ice::ObjectPrxPtr&, const Ice::Current&); virtual void setReplicatedAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&, - const std::string&, const std::string&, const Ice::ObjectPrx&, + const std::string&, const std::string&, const Ice::ObjectPrxPtr&, const Ice::Current&); virtual void setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, - const Ice::ProcessPrx&, const Ice::Current&); + const Ice::ProcessPrxPtr&, const Ice::Current&); - Ice::ObjectPrx findObject(const Ice::Identity&) const; - Ice::ObjectPrx findAdapter(const std::string&, bool&) const; + Ice::ObjectPrxPtr findObject(const Ice::Identity&) const; + Ice::ObjectPrxPtr findAdapter(const std::string&, bool&) const; private: - const Ice::ObjectPrx _wellKnownProxy; - std::map _adapters; + const Ice::ObjectPrxPtr _wellKnownProxy; + std::map _adapters; std::map > _replicaGroups; }; -typedef IceInternal::Handle LocatorRegistryIPtr; +ICE_DEFINE_PTR(LocatorRegistryIPtr, LocatorRegistryI); class LookupI; -typedef IceInternal::Handle LookupIPtr; +ICE_DEFINE_PTR(LookupIPtr, LookupI); class LocatorI : public Ice::Locator { public: - LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrx&); + LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrxPtr&); virtual void findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, @@ -65,12 +65,12 @@ public: findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, const Ice::Current&) const; - virtual Ice::LocatorRegistryPrx getRegistry(const Ice::Current&) const; + virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const; private: LookupIPtr _lookup; - Ice::LocatorRegistryPrx _registry; + Ice::LocatorRegistryPrxPtr _registry; }; }; diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp index c1778a6eb92..54835ed4de0 100644 --- a/cpp/src/IceDiscovery/LookupI.cpp +++ b/cpp/src/IceDiscovery/LookupI.cpp @@ -36,7 +36,7 @@ AdapterRequest::retry() } bool -AdapterRequest::response(const Ice::ObjectPrx& proxy, bool isReplicaGroup) +AdapterRequest::response(const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup) { if(isReplicaGroup) { @@ -54,7 +54,7 @@ AdapterRequest::response(const Ice::ObjectPrx& proxy, bool isReplicaGroup) } void -AdapterRequest::finished(const Ice::ObjectPrx& proxy) +AdapterRequest::finished(const Ice::ObjectPrxPtr& proxy) { if(proxy || _proxies.empty()) { @@ -68,8 +68,8 @@ AdapterRequest::finished(const Ice::ObjectPrx& proxy) } Ice::EndpointSeq endpoints; - Ice::ObjectPrx prx; - for(vector::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p) + Ice::ObjectPrxPtr prx; + for(vector::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p) { if(!prx) { @@ -88,7 +88,7 @@ AdapterRequest::runTimerTask() } void -ObjectRequest::response(const Ice::ObjectPrx& proxy) +ObjectRequest::response(const Ice::ObjectPrxPtr& proxy) { finished(proxy); } @@ -99,7 +99,7 @@ ObjectRequest::runTimerTask() _lookup->objectRequestTimedOut(this); } -LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrx& lookup, const Ice::PropertiesPtr& properties) : +LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrxPtr& lookup, const Ice::PropertiesPtr& properties) : _registry(registry), _lookup(lookup), _timeout(IceUtil::Time::milliSeconds(properties->getPropertyAsIntWithDefault("IceDiscovery.Timeout", 300))), @@ -147,7 +147,7 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I return; // Ignore. } - Ice::ObjectPrx proxy = _registry->findObject(id); + Ice::ObjectPrxPtr proxy = _registry->findObject(id); if(proxy) { // @@ -174,7 +174,7 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId, } bool isReplicaGroup; - Ice::ObjectPrx proxy = _registry->findAdapter(adapterId, isReplicaGroup); + Ice::ObjectPrxPtr proxy = _registry->findAdapter(adapterId, isReplicaGroup); if(proxy) { // @@ -242,7 +242,7 @@ LookupI::findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr& cb, const std::s } void -LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrx& proxy) +LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrxPtr& proxy) { Lock sync(*this); map::iterator p = _objectRequests.find(id); @@ -257,7 +257,7 @@ LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrx& proxy) } void -LookupI::foundAdapter(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup) +LookupI::foundAdapter(const std::string& adapterId, const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup) { Lock sync(*this); map::iterator p = _adapterRequests.find(adapterId); @@ -334,13 +334,13 @@ LookupReplyI::LookupReplyI(const LookupIPtr& lookup) : _lookup(lookup) } void -LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrx& proxy, const Ice::Current&) +LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrxPtr& proxy, const Ice::Current&) { _lookup->foundObject(id, proxy); } void -LookupReplyI::foundAdapterById(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup, +LookupReplyI::foundAdapterById(const std::string& adapterId, const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup, const Ice::Current&) { _lookup->foundAdapter(adapterId, proxy, isReplicaGroup); diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h index 145da1d5670..fd854167fb0 100644 --- a/cpp/src/IceDiscovery/LookupI.h +++ b/cpp/src/IceDiscovery/LookupI.h @@ -54,7 +54,7 @@ public: return _callbacks.size() == 1; } - virtual void finished(const Ice::ObjectPrx& proxy) + virtual void finished(const Ice::ObjectPrxPtr& proxy) { for(typename std::vector::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p) { @@ -78,7 +78,7 @@ public: { } - void response(const Ice::ObjectPrx&); + void response(const Ice::ObjectPrxPtr&); private: @@ -96,15 +96,15 @@ public: { } - bool response(const Ice::ObjectPrx&, bool); + bool response(const Ice::ObjectPrxPtr&, bool); virtual bool retry(); - virtual void finished(const Ice::ObjectPrx&); + virtual void finished(const Ice::ObjectPrxPtr&); private: virtual void runTimerTask(); - std::vector _proxies; + std::vector _proxies; IceUtil::Time _start; IceUtil::Time _latency; }; @@ -114,23 +114,23 @@ class LookupI : public Lookup, private IceUtil::Mutex { public: - LookupI(const LocatorRegistryIPtr&, const LookupPrx&, const Ice::PropertiesPtr&); + LookupI(const LocatorRegistryIPtr&, const LookupPrxPtr&, const Ice::PropertiesPtr&); virtual ~LookupI(); void destroy(); - void setLookupReply(const LookupReplyPrx&); + void setLookupReply(const LookupReplyPrxPtr&); - virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&, + virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrxPtr&, const Ice::Current&); - virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&, + virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrxPtr&, const Ice::Current&); void findObject(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&); void findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&); - void foundObject(const Ice::Identity&, const Ice::ObjectPrx&); - void foundAdapter(const std::string&, const Ice::ObjectPrx&, bool); + void foundObject(const Ice::Identity&, const Ice::ObjectPrxPtr&); + void foundAdapter(const std::string&, const Ice::ObjectPrxPtr&, bool); void adapterRequestTimedOut(const AdapterRequestPtr&); void objectRequestTimedOut(const ObjectRequestPtr&); @@ -150,15 +150,15 @@ public: private: LocatorRegistryIPtr _registry; - const LookupPrx _lookup; - LookupReplyPrx _lookupReply; + const LookupPrxPtr _lookup; + LookupReplyPrxPtr _lookupReply; const IceUtil::Time _timeout; const int _retryCount; const int _latencyMultiplier; const std::string _domainId; IceUtil::TimerPtr _timer; - Ice::ObjectPrx _wellKnownProxy; + Ice::ObjectPrxPtr _wellKnownProxy; std::map _objectRequests; std::map _adapterRequests; @@ -170,8 +170,8 @@ public: LookupReplyI(const LookupIPtr&); - virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrx&, const Ice::Current&); - virtual void foundAdapterById(const std::string&, const Ice::ObjectPrx&, bool, const Ice::Current&); + virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrxPtr&, const Ice::Current&); + virtual void foundAdapterById(const std::string&, const Ice::ObjectPrxPtr&, bool, const Ice::Current&); private: diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index deb4df90340..f2540c7e495 100755 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -5,6 +5,7 @@ Internal.h: \ "$(slicedir)/Ice/BuiltinSequences.ice" \ "$(slicedir)/Ice/ProcessF.ice" \ "$(slicedir)/Ice/Locator.ice" \ + "$(slicedir)/Ice/Process.ice" \ "$(slicedir)/Ice/Properties.ice" \ "$(slicedir)/Ice/PropertiesAdmin.ice" \ "$(slicedir)/Glacier2/Session.ice" \ @@ -21,7 +22,7 @@ IceLocatorDiscovery.h: \ "$(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice" \ "$(slicedir)/Ice/Locator.ice" \ "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/ProcessF.ice" + "$(slicedir)/Ice/Process.ice" DBTypes.h: \ DBTypes.ice \ @@ -65,6 +66,7 @@ Client.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -73,6 +75,7 @@ Client.obj: \ "$(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" \ @@ -107,7 +110,7 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -120,6 +123,7 @@ Client.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -131,7 +135,6 @@ Client.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -154,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -195,6 +197,7 @@ DescriptorBuilder.obj: \ "$(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" \ @@ -203,6 +206,7 @@ DescriptorBuilder.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -237,7 +241,7 @@ DescriptorBuilder.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -246,6 +250,7 @@ DescriptorBuilder.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -270,7 +275,6 @@ DescriptorBuilder.obj: \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ "Util.h" \ "$(includedir)\IceUtil\StringUtil.h" \ @@ -298,6 +302,7 @@ DescriptorHelper.obj: \ "$(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" \ @@ -306,6 +311,7 @@ DescriptorHelper.obj: \ "$(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" \ @@ -346,7 +352,7 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -360,6 +366,7 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -371,7 +378,6 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -394,7 +400,6 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -414,6 +419,7 @@ DescriptorHelper.obj: \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceGrid\Descriptor.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -437,6 +443,7 @@ DescriptorParser.obj: \ "$(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" \ @@ -445,6 +452,7 @@ DescriptorParser.obj: \ "$(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" \ @@ -485,7 +493,7 @@ DescriptorParser.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -499,6 +507,7 @@ DescriptorParser.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -510,7 +519,6 @@ DescriptorParser.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -533,7 +541,6 @@ DescriptorParser.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -574,6 +581,7 @@ FileParserI.obj: \ "$(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" \ @@ -582,6 +590,7 @@ FileParserI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -616,7 +625,7 @@ FileParserI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -625,6 +634,7 @@ FileParserI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -632,7 +642,6 @@ FileParserI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Properties.h" \ @@ -688,6 +697,7 @@ Parser.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -695,6 +705,7 @@ Parser.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -723,7 +734,7 @@ Parser.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -736,6 +747,7 @@ Parser.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -747,7 +759,6 @@ Parser.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -769,7 +780,6 @@ Parser.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -795,6 +805,7 @@ Parser.obj: \ "DescriptorHelper.h" \ "$(includedir)\IceUtil\OutputUtil.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -817,6 +828,7 @@ Util.obj: \ "$(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" \ @@ -825,6 +837,7 @@ Util.obj: \ "$(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" \ @@ -865,7 +878,7 @@ Util.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -879,6 +892,7 @@ Util.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -890,7 +904,6 @@ Util.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -913,7 +926,6 @@ Util.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -933,6 +945,7 @@ Util.obj: \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\IceUtil\Random.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -951,6 +964,7 @@ Internal.obj: \ "$(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" \ @@ -959,6 +973,7 @@ Internal.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -993,7 +1008,7 @@ Internal.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1002,6 +1017,7 @@ Internal.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1009,10 +1025,10 @@ Internal.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -1049,6 +1065,7 @@ IceLocatorDiscovery.obj: \ "$(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" \ @@ -1057,6 +1074,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1091,7 +1109,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1100,6 +1118,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1107,9 +1126,8 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -1136,6 +1154,7 @@ Grammar.obj: \ "$(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" \ @@ -1144,6 +1163,7 @@ Grammar.obj: \ "$(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" \ @@ -1184,7 +1204,7 @@ Grammar.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1198,6 +1218,7 @@ Grammar.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1209,7 +1230,6 @@ Grammar.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1232,7 +1252,6 @@ Grammar.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1268,6 +1287,7 @@ Scanner.obj: \ "$(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" \ @@ -1276,6 +1296,7 @@ Scanner.obj: \ "$(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" \ @@ -1316,7 +1337,7 @@ Scanner.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1330,6 +1351,7 @@ Scanner.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1341,7 +1363,6 @@ Scanner.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1364,7 +1385,6 @@ Scanner.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1407,6 +1427,7 @@ IceGridDB.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -1415,6 +1436,7 @@ IceGridDB.obj: \ "$(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" \ @@ -1451,7 +1473,7 @@ IceGridDB.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1465,6 +1487,7 @@ IceGridDB.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1476,7 +1499,6 @@ IceGridDB.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1498,7 +1520,6 @@ IceGridDB.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1536,6 +1557,7 @@ DBTypes.obj: \ "$(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" \ @@ -1544,6 +1566,7 @@ DBTypes.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1578,7 +1601,7 @@ DBTypes.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1587,6 +1610,7 @@ DBTypes.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1594,7 +1618,6 @@ DBTypes.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Properties.h" \ @@ -1632,6 +1655,7 @@ AdminRouter.obj: \ "$(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" \ @@ -1640,6 +1664,7 @@ AdminRouter.obj: \ "$(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" \ @@ -1680,7 +1705,7 @@ AdminRouter.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1694,6 +1719,7 @@ AdminRouter.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1705,7 +1731,6 @@ AdminRouter.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1728,7 +1753,6 @@ AdminRouter.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1752,6 +1776,7 @@ FileCache.obj: \ "$(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" \ @@ -1760,6 +1785,7 @@ FileCache.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1794,7 +1820,7 @@ FileCache.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1803,6 +1829,7 @@ FileCache.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1823,7 +1850,6 @@ FileCache.obj: \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ PlatformInfo.obj: \ @@ -1842,6 +1868,7 @@ PlatformInfo.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -1850,6 +1877,7 @@ PlatformInfo.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1884,7 +1912,7 @@ PlatformInfo.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1893,6 +1921,7 @@ PlatformInfo.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1917,9 +1946,9 @@ PlatformInfo.obj: \ "Internal.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -1949,6 +1978,7 @@ SessionManager.obj: \ "$(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" \ @@ -1957,6 +1987,7 @@ SessionManager.obj: \ "$(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" \ @@ -1997,7 +2028,7 @@ SessionManager.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2011,6 +2042,7 @@ SessionManager.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2022,7 +2054,6 @@ SessionManager.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2045,7 +2076,6 @@ SessionManager.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2059,6 +2089,7 @@ SessionManager.obj: \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -2082,6 +2113,7 @@ TraceLevels.obj: \ "$(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" \ @@ -2090,6 +2122,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2124,7 +2157,7 @@ TraceLevels.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2133,6 +2166,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2168,6 +2202,7 @@ Activator.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2176,6 +2211,7 @@ Activator.obj: \ "$(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" \ @@ -2216,7 +2252,7 @@ Activator.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2230,6 +2266,7 @@ Activator.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2241,7 +2278,6 @@ Activator.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2264,7 +2300,6 @@ Activator.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2275,6 +2310,7 @@ Activator.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "Activator.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -2319,6 +2355,7 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2327,6 +2364,7 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -2354,7 +2392,7 @@ NodeAdminRouter.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2363,6 +2401,7 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2370,13 +2409,13 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IcePatch2\Config.h" \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -2420,7 +2459,6 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ @@ -2465,6 +2503,7 @@ NodeI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2473,6 +2512,7 @@ NodeI.obj: \ "$(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" \ @@ -2504,7 +2544,7 @@ NodeI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2518,6 +2558,7 @@ NodeI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2529,7 +2570,6 @@ NodeI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2552,7 +2592,6 @@ NodeI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2568,6 +2607,7 @@ NodeI.obj: \ "$(includedir)\IcePatch2\FileServer.h" \ "NodeI.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -2608,6 +2648,7 @@ NodeSessionManager.obj: \ "$(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" \ @@ -2616,6 +2657,7 @@ NodeSessionManager.obj: \ "$(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" \ @@ -2656,7 +2698,7 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2670,6 +2712,7 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2681,7 +2724,6 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2704,7 +2746,6 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2719,6 +2760,7 @@ NodeSessionManager.obj: \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -2752,6 +2794,7 @@ ServerAdapterI.obj: \ "$(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" \ @@ -2760,6 +2803,7 @@ ServerAdapterI.obj: \ "$(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" \ @@ -2800,7 +2844,7 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2814,6 +2858,7 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2825,7 +2870,6 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2848,7 +2892,6 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2859,6 +2902,7 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "ServerAdapterI.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -2898,6 +2942,7 @@ ServerI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2906,6 +2951,7 @@ ServerI.obj: \ "$(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" \ @@ -2946,7 +2992,7 @@ ServerI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2960,6 +3006,7 @@ ServerI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2971,7 +3018,6 @@ ServerI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2994,7 +3040,6 @@ ServerI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -3006,6 +3051,7 @@ ServerI.obj: \ "ServerI.h" \ "Activator.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -3048,6 +3094,7 @@ AdapterCache.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -3056,6 +3103,7 @@ AdapterCache.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -3090,7 +3138,7 @@ AdapterCache.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3099,6 +3147,7 @@ AdapterCache.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3120,8 +3169,7 @@ AdapterCache.obj: \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "AdapterCache.h" \ "Cache.h" \ "Util.h" \ @@ -3137,6 +3185,7 @@ AdapterCache.obj: \ "TraceLevels.h" \ "$(includedir)\IceGrid\Query.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -3167,7 +3216,6 @@ AdapterCache.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ @@ -3202,6 +3250,7 @@ AdminCallbackRouter.obj: \ "$(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" \ @@ -3210,6 +3259,7 @@ AdminCallbackRouter.obj: \ "$(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" \ @@ -3250,7 +3300,7 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3264,6 +3314,7 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3275,7 +3326,6 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -3298,7 +3348,6 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -3329,6 +3378,7 @@ AdminI.obj: \ "$(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" \ @@ -3337,6 +3387,7 @@ AdminI.obj: \ "$(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" \ @@ -3377,7 +3428,7 @@ AdminI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3391,6 +3442,7 @@ AdminI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3402,7 +3454,6 @@ AdminI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -3425,7 +3476,6 @@ AdminI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -3450,6 +3500,7 @@ AdminI.obj: \ "$(includedir)\IceGrid\Query.h" \ "$(includedir)\IceGrid\Locator.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "PlatformInfo.h" \ "ReplicaSessionManager.h" \ @@ -3509,6 +3560,7 @@ AdminSessionI.obj: \ "$(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" \ @@ -3517,6 +3569,7 @@ AdminSessionI.obj: \ "$(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" \ @@ -3557,7 +3610,7 @@ AdminSessionI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3571,6 +3624,7 @@ AdminSessionI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3582,7 +3636,6 @@ AdminSessionI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -3605,7 +3658,6 @@ AdminSessionI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -3628,6 +3680,7 @@ AdminSessionI.obj: \ "$(includedir)\IceGrid\Query.h" \ "$(includedir)\IceGrid\Locator.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "PlatformInfo.h" \ "ReplicaSessionManager.h" \ @@ -3694,6 +3747,7 @@ Allocatable.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -3702,6 +3756,7 @@ Allocatable.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -3729,7 +3784,7 @@ Allocatable.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3738,6 +3793,7 @@ Allocatable.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3745,7 +3801,6 @@ Allocatable.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -3793,7 +3848,6 @@ Allocatable.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -3822,6 +3876,7 @@ AllocatableObjectCache.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -3830,6 +3885,7 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -3864,7 +3920,7 @@ AllocatableObjectCache.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -3873,6 +3929,7 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -3898,7 +3955,6 @@ AllocatableObjectCache.obj: \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -3939,7 +3995,6 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -3970,6 +4025,7 @@ Database.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -3978,6 +4034,7 @@ Database.obj: \ "$(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" \ @@ -4016,7 +4073,7 @@ Database.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4025,6 +4082,7 @@ Database.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4045,7 +4103,6 @@ Database.obj: \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -4056,6 +4113,7 @@ Database.obj: \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -4113,6 +4171,7 @@ FileUserAccountMapperI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -4121,6 +4180,7 @@ FileUserAccountMapperI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -4155,7 +4215,7 @@ FileUserAccountMapperI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4164,13 +4224,13 @@ FileUserAccountMapperI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ InternalRegistryI.obj: \ @@ -4190,6 +4250,7 @@ InternalRegistryI.obj: \ "$(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" \ @@ -4198,6 +4259,7 @@ InternalRegistryI.obj: \ "$(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" \ @@ -4238,7 +4300,7 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4252,6 +4314,7 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4263,7 +4326,6 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -4286,7 +4348,6 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -4308,6 +4369,7 @@ InternalRegistryI.obj: \ "$(includedir)\IceGrid\Query.h" \ "$(includedir)\IceGrid\Locator.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "PlatformInfo.h" \ "ReplicaSessionManager.h" \ @@ -4367,6 +4429,7 @@ LocatorI.obj: \ "$(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" \ @@ -4375,6 +4438,7 @@ LocatorI.obj: \ "$(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" \ @@ -4415,7 +4479,7 @@ LocatorI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4429,6 +4493,7 @@ LocatorI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4440,7 +4505,6 @@ LocatorI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -4463,7 +4527,6 @@ LocatorI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -4474,6 +4537,7 @@ LocatorI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "LocatorI.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -4533,6 +4597,7 @@ LocatorRegistryI.obj: \ "$(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" \ @@ -4541,6 +4606,7 @@ LocatorRegistryI.obj: \ "$(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" \ @@ -4581,7 +4647,7 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4595,6 +4661,7 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4606,7 +4673,6 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -4629,7 +4695,6 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -4640,6 +4705,7 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "LocatorRegistryI.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -4691,6 +4757,7 @@ NodeCache.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -4699,6 +4766,7 @@ NodeCache.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -4733,7 +4801,7 @@ NodeCache.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4742,6 +4810,7 @@ NodeCache.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4767,7 +4836,6 @@ NodeCache.obj: \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -4781,6 +4849,7 @@ NodeCache.obj: \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -4806,7 +4875,6 @@ NodeCache.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ @@ -4851,6 +4919,7 @@ NodeSessionI.obj: \ "$(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" \ @@ -4859,6 +4928,7 @@ NodeSessionI.obj: \ "$(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" \ @@ -4899,7 +4969,7 @@ NodeSessionI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -4913,6 +4983,7 @@ NodeSessionI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -4924,7 +4995,6 @@ NodeSessionI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -4947,7 +5017,6 @@ NodeSessionI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -4958,6 +5027,7 @@ NodeSessionI.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "NodeSessionI.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -5007,6 +5077,7 @@ ObjectCache.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -5015,6 +5086,7 @@ ObjectCache.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -5049,7 +5121,7 @@ ObjectCache.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5058,6 +5130,7 @@ ObjectCache.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5083,7 +5156,6 @@ ObjectCache.obj: \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -5096,6 +5168,7 @@ ObjectCache.obj: \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -5124,7 +5197,6 @@ ObjectCache.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ @@ -5163,6 +5235,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -5171,6 +5244,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ @@ -5200,7 +5274,7 @@ PluginFacadeI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5209,6 +5283,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5216,7 +5291,6 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -5233,6 +5307,7 @@ PluginFacadeI.obj: \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -5283,6 +5358,7 @@ QueryI.obj: \ "$(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" \ @@ -5291,6 +5367,7 @@ QueryI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -5325,7 +5402,7 @@ QueryI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5334,6 +5411,7 @@ QueryI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5341,10 +5419,10 @@ QueryI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -5410,6 +5488,7 @@ ReapThread.obj: \ "$(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" \ @@ -5418,6 +5497,7 @@ ReapThread.obj: \ "$(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" \ @@ -5458,7 +5538,7 @@ ReapThread.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5472,6 +5552,7 @@ ReapThread.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5483,7 +5564,6 @@ ReapThread.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -5506,7 +5586,6 @@ ReapThread.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -5539,6 +5618,7 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -5547,6 +5627,7 @@ RegistryAdminRouter.obj: \ "$(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" \ @@ -5576,7 +5657,7 @@ RegistryAdminRouter.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5585,6 +5666,7 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5592,7 +5674,6 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ @@ -5606,6 +5687,7 @@ RegistryAdminRouter.obj: \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -5661,7 +5743,6 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ @@ -5693,6 +5774,7 @@ RegistryI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -5701,6 +5783,7 @@ RegistryI.obj: \ "$(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" \ @@ -5741,7 +5824,7 @@ RegistryI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5755,6 +5838,7 @@ RegistryI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5766,7 +5850,6 @@ RegistryI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -5789,7 +5872,6 @@ RegistryI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -5829,6 +5911,7 @@ RegistryI.obj: \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceGrid\Descriptor.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -5889,6 +5972,7 @@ ReplicaCache.obj: \ "$(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" \ @@ -5897,6 +5981,7 @@ ReplicaCache.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -5931,7 +6016,7 @@ ReplicaCache.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -5940,6 +6025,7 @@ ReplicaCache.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -5965,7 +6051,6 @@ ReplicaCache.obj: \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -5979,6 +6064,7 @@ ReplicaCache.obj: \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Session.h" \ @@ -6005,6 +6091,7 @@ ReplicaSessionI.obj: \ "$(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" \ @@ -6013,6 +6100,7 @@ ReplicaSessionI.obj: \ "$(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" \ @@ -6053,7 +6141,7 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6067,6 +6155,7 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6078,7 +6167,6 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -6101,7 +6189,6 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -6121,6 +6208,7 @@ ReplicaSessionI.obj: \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\IceGrid\Descriptor.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "Database.h" \ "$(includedir)\IceUtil\FileUtil.h" \ @@ -6165,6 +6253,7 @@ ReplicaSessionManager.obj: \ "$(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" \ @@ -6173,6 +6262,7 @@ ReplicaSessionManager.obj: \ "$(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" \ @@ -6213,7 +6303,7 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6227,6 +6317,7 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6238,7 +6329,6 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -6261,7 +6351,6 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -6276,6 +6365,7 @@ ReplicaSessionManager.obj: \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -6325,6 +6415,7 @@ ServerCache.obj: \ "$(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" \ @@ -6333,6 +6424,7 @@ ServerCache.obj: \ "$(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" \ @@ -6371,7 +6463,7 @@ ServerCache.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6380,6 +6472,7 @@ ServerCache.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6398,11 +6491,11 @@ ServerCache.obj: \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ "Internal.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -6445,7 +6538,6 @@ ServerCache.obj: \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ @@ -6482,6 +6574,7 @@ SessionI.obj: \ "$(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" \ @@ -6490,6 +6583,7 @@ SessionI.obj: \ "$(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" \ @@ -6530,7 +6624,7 @@ SessionI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6544,6 +6638,7 @@ SessionI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6555,7 +6650,6 @@ SessionI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -6578,7 +6672,6 @@ SessionI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -6605,6 +6698,7 @@ SessionI.obj: \ "$(includedir)\IceGrid\Query.h" \ "LocatorI.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\IceGrid\Observer.h" \ @@ -6650,6 +6744,7 @@ SessionServantManager.obj: \ "$(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" \ @@ -6658,6 +6753,7 @@ SessionServantManager.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -6694,7 +6790,7 @@ SessionServantManager.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6721,6 +6817,7 @@ SessionServantManager.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ @@ -6731,7 +6828,6 @@ SessionServantManager.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -6750,7 +6846,6 @@ SessionServantManager.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -6782,6 +6877,7 @@ Topics.obj: \ "$(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" \ @@ -6790,6 +6886,7 @@ Topics.obj: \ "$(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" \ @@ -6830,7 +6927,7 @@ Topics.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6844,6 +6941,7 @@ Topics.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -6855,7 +6953,6 @@ Topics.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -6878,7 +6975,6 @@ Topics.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -6892,6 +6988,7 @@ Topics.obj: \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -6920,6 +7017,7 @@ WellKnownObjectsManager.obj: \ "$(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" \ @@ -6928,6 +7026,7 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -6964,7 +7063,7 @@ WellKnownObjectsManager.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -6973,13 +7072,13 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ "WellKnownObjectsManager.h" \ @@ -6987,6 +7086,7 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Locator.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -7062,6 +7162,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -7070,6 +7171,7 @@ IceGridNode.obj: \ "$(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" \ @@ -7101,7 +7203,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7115,6 +7217,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7126,7 +7229,6 @@ IceGridNode.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -7149,7 +7251,6 @@ IceGridNode.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -7160,6 +7261,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "Activator.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -7222,6 +7324,7 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -7230,6 +7333,7 @@ IceGridRegistry.obj: \ "$(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" \ @@ -7266,7 +7370,7 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -7280,6 +7384,7 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -7291,7 +7396,6 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -7314,7 +7418,6 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -7336,6 +7439,7 @@ IceGridRegistry.obj: \ "$(includedir)\IceGrid\Query.h" \ "$(includedir)\IceGrid\Locator.h" \ "Internal.h" \ + "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\IceGrid\Observer.h" \ "PlatformInfo.h" \ "ReplicaSessionManager.h" \ diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak index 8c45d59ffd5..990261a241e 100755 --- a/cpp/src/IceGridLib/.depend.mak +++ b/cpp/src/IceGridLib/.depend.mak @@ -38,7 +38,7 @@ Locator.h: \ "$(slicedir)\IceGrid\Locator.ice" \ "$(slicedir)/Ice/Locator.ice" \ "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/ProcessF.ice" + "$(slicedir)/Ice/Process.ice" Observer.h: \ "$(slicedir)\IceGrid\Observer.ice" \ @@ -116,6 +116,7 @@ PluginFacadeI.obj: \ "$(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" \ @@ -124,6 +125,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -158,7 +160,7 @@ PluginFacadeI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -167,6 +169,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -174,7 +177,6 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ @@ -188,7 +190,7 @@ PluginFacadeI.obj: \ "$(includedir)\IceGrid\FileParser.h" \ "$(includedir)\IceGrid\Locator.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Observer.h" \ "$(includedir)\IceGrid\Query.h" \ "$(includedir)\IceGrid\Registry.h" \ @@ -210,6 +212,7 @@ Admin.obj: \ "$(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" \ @@ -218,6 +221,7 @@ Admin.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -252,7 +256,7 @@ Admin.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -261,6 +265,7 @@ Admin.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -268,7 +273,6 @@ Admin.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ @@ -302,6 +306,7 @@ Descriptor.obj: \ "$(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" \ @@ -310,6 +315,7 @@ Descriptor.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -344,7 +350,7 @@ Descriptor.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -353,13 +359,13 @@ Descriptor.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -385,6 +391,7 @@ Exception.obj: \ "$(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" \ @@ -393,6 +400,7 @@ Exception.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -401,12 +409,11 @@ Exception.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Config.h" \ @@ -441,6 +448,7 @@ FileParser.obj: \ "$(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" \ @@ -449,6 +457,7 @@ FileParser.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -483,7 +492,7 @@ FileParser.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -492,6 +501,7 @@ FileParser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -499,7 +509,6 @@ FileParser.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Properties.h" \ @@ -534,6 +543,7 @@ Locator.obj: \ "$(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" \ @@ -542,6 +552,7 @@ Locator.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -576,7 +587,7 @@ Locator.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -585,6 +596,7 @@ Locator.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -592,9 +604,8 @@ Locator.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -620,6 +631,7 @@ Observer.obj: \ "$(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" \ @@ -628,6 +640,7 @@ Observer.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -662,7 +675,7 @@ Observer.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -671,6 +684,7 @@ Observer.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -678,7 +692,6 @@ Observer.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -713,6 +726,7 @@ PluginFacade.obj: \ "$(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" \ @@ -721,6 +735,7 @@ PluginFacade.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -755,7 +770,7 @@ PluginFacade.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -764,6 +779,7 @@ PluginFacade.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -771,7 +787,6 @@ PluginFacade.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -806,6 +821,7 @@ Query.obj: \ "$(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" \ @@ -814,6 +830,7 @@ Query.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -848,7 +865,7 @@ Query.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -857,13 +874,13 @@ Query.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ @@ -890,6 +907,7 @@ Registry.obj: \ "$(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" \ @@ -898,6 +916,7 @@ Registry.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -932,7 +951,7 @@ Registry.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -941,6 +960,7 @@ Registry.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -948,7 +968,6 @@ Registry.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Config.h" \ @@ -984,6 +1003,7 @@ Session.obj: \ "$(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" \ @@ -992,6 +1012,7 @@ Session.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1026,7 +1047,7 @@ Session.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1035,6 +1056,7 @@ Session.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1042,7 +1064,6 @@ Session.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -1073,6 +1094,7 @@ UserAccountMapper.obj: \ "$(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" \ @@ -1081,6 +1103,7 @@ UserAccountMapper.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1115,7 +1138,7 @@ UserAccountMapper.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1124,13 +1147,13 @@ UserAccountMapper.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak index 02e8062654f..fd730bba1d9 100755 --- a/cpp/src/IceLocatorDiscovery/.depend.mak +++ b/cpp/src/IceLocatorDiscovery/.depend.mak @@ -3,7 +3,7 @@ IceLocatorDiscovery.h: \ "$(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice" \ "$(slicedir)/Ice/Locator.ice" \ "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/ProcessF.ice" + "$(slicedir)/Ice/Process.ice" PluginI.obj: \ PluginI.cpp \ @@ -40,6 +40,7 @@ PluginI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -47,6 +48,7 @@ PluginI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -75,7 +77,7 @@ PluginI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -88,6 +90,7 @@ PluginI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -99,7 +102,6 @@ PluginI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -121,7 +123,6 @@ PluginI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -147,6 +148,7 @@ IceLocatorDiscovery.obj: \ "$(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" \ @@ -155,6 +157,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -189,7 +192,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -198,6 +201,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -205,9 +209,8 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak index 8dd23e9a528..36f69efca33 100755 --- a/cpp/src/IcePatch2/.depend.mak +++ b/cpp/src/IcePatch2/.depend.mak @@ -21,6 +21,7 @@ FileServerI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -28,6 +29,7 @@ FileServerI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ @@ -68,7 +70,7 @@ FileServerI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -82,6 +84,7 @@ FileServerI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -93,7 +96,6 @@ FileServerI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -116,7 +118,6 @@ FileServerI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -155,6 +156,7 @@ Server.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -163,6 +165,7 @@ Server.obj: \ "$(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" \ @@ -199,7 +202,7 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -213,6 +216,7 @@ Server.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -224,7 +228,6 @@ Server.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -247,7 +250,6 @@ Server.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -285,6 +287,7 @@ Client.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -293,6 +296,7 @@ Client.obj: \ "$(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" \ @@ -329,7 +333,7 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -343,6 +347,7 @@ Client.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -354,7 +359,6 @@ Client.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -376,7 +380,6 @@ Client.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -416,6 +419,7 @@ Calc.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -424,6 +428,7 @@ Calc.obj: \ "$(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" \ @@ -460,7 +465,7 @@ Calc.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -474,6 +479,7 @@ Calc.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -485,7 +491,6 @@ Calc.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -508,7 +513,6 @@ Calc.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index 0cb1b3dd19b..64275c06071 100755 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak @@ -27,6 +27,7 @@ ClientUtil.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -35,6 +36,7 @@ ClientUtil.obj: \ "$(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" \ @@ -75,7 +77,7 @@ ClientUtil.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -89,6 +91,7 @@ ClientUtil.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -100,7 +103,6 @@ ClientUtil.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -123,7 +125,6 @@ ClientUtil.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -176,6 +177,7 @@ Util.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -183,6 +185,7 @@ Util.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -211,7 +214,7 @@ Util.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -224,6 +227,7 @@ Util.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -235,7 +239,6 @@ Util.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -257,7 +260,6 @@ Util.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -284,6 +286,7 @@ FileInfo.obj: \ "$(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" \ @@ -292,6 +295,7 @@ FileInfo.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -312,7 +316,7 @@ FileInfo.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -334,6 +338,7 @@ FileServer.obj: \ "$(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" \ @@ -342,6 +347,7 @@ FileServer.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -376,7 +382,7 @@ FileServer.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -385,6 +391,7 @@ FileServer.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -392,7 +399,6 @@ FileServer.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IcePatch2\Config.h" \ diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak index 88383320dee..10b607aeafc 100755 --- a/cpp/src/IceSSL/.depend.mak +++ b/cpp/src/IceSSL/.depend.mak @@ -30,6 +30,7 @@ ConnectionInfo.obj: \ "$(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" \ @@ -38,6 +39,7 @@ ConnectionInfo.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -72,7 +74,7 @@ ConnectionInfo.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -101,6 +103,7 @@ EndpointInfo.obj: \ "$(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" \ @@ -109,6 +112,7 @@ EndpointInfo.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\Version.h" \ @@ -130,7 +134,7 @@ EndpointInfo.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -160,6 +164,7 @@ AcceptorI.obj: \ "$(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" \ @@ -168,6 +173,7 @@ AcceptorI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -202,7 +208,7 @@ AcceptorI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -213,13 +219,13 @@ AcceptorI.obj: \ "..\..\src\Ice\ProtocolInstanceF.h" \ "InstanceF.h" \ "EndpointI.h" \ - "..\..\src\Ice\IPEndpointI.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "..\..\src\Ice\IPEndpointIF.h" \ "..\..\src\Ice\EndpointI.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "..\..\src\Ice\ConnectorF.h" \ + "..\..\src\Ice\IPEndpointI.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "..\..\src\Ice\IPEndpointIF.h" \ "..\..\src\Ice\EndpointFactory.h" \ "..\..\src\Ice\EndpointFactoryF.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -254,6 +260,7 @@ AcceptorI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -306,6 +313,7 @@ Certificate.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -314,6 +322,7 @@ Certificate.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -347,7 +356,7 @@ Certificate.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -380,6 +389,7 @@ ConnectorI.obj: \ "$(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" \ @@ -388,6 +398,7 @@ ConnectorI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -422,7 +433,7 @@ ConnectorI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -469,6 +480,7 @@ ConnectorI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -486,9 +498,9 @@ ConnectorI.obj: \ "SecureTransportTransceiverI.h" \ "SChannelTransceiverI.h" \ "EndpointI.h" \ - "..\..\src\Ice\IPEndpointI.h" \ "..\..\src\Ice\EndpointI.h" \ "..\..\src\Ice\AcceptorF.h" \ + "..\..\src\Ice\IPEndpointI.h" \ "..\..\src\Ice\EndpointFactory.h" \ "..\..\src\Ice\EndpointFactoryF.h" \ "..\..\src\Ice\WSEndpoint.h" \ @@ -507,30 +519,21 @@ ConnectorI.obj: \ EndpointI.obj: \ EndpointI.cpp \ "EndpointI.h" \ - "..\..\src\Ice\IPEndpointI.h" \ - "$(includedir)\IceUtil\Config.h" \ + "..\..\src\Ice\EndpointI.h" \ + "..\..\src\Ice\EndpointIF.h" \ "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\Handle.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "..\..\src\Ice\IPEndpointIF.h" \ - "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\Config.h" \ - "..\..\src\Ice\EndpointI.h" \ - "..\..\src\Ice\EndpointIF.h" \ "$(includedir)\Ice\Endpoint.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" \ @@ -539,6 +542,7 @@ EndpointI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -549,6 +553,16 @@ EndpointI.obj: \ "..\..\src\Ice\TransceiverF.h" \ "..\..\src\Ice\ConnectorF.h" \ "..\..\src\Ice\AcceptorF.h" \ + "..\..\src\Ice\IPEndpointI.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "..\..\src\Ice\IPEndpointIF.h" \ "..\..\src\Ice\Network.h" \ "..\..\src\Ice\NetworkF.h" \ "..\..\src\Ice\NetworkProxyF.h" \ @@ -574,7 +588,7 @@ EndpointI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -617,6 +631,7 @@ EndpointI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -653,6 +668,7 @@ Instance.obj: \ "$(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" \ @@ -661,6 +677,7 @@ Instance.obj: \ "$(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" \ @@ -695,7 +712,7 @@ Instance.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -741,6 +758,7 @@ Instance.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -774,6 +792,7 @@ PluginI.obj: \ "$(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" \ @@ -782,6 +801,7 @@ PluginI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -819,7 +839,7 @@ PluginI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -868,6 +888,7 @@ PluginI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -877,10 +898,10 @@ PluginI.obj: \ "TrustManagerF.h" \ "..\..\src\Ice\Network.h" \ "EndpointI.h" \ - "..\..\src\Ice\IPEndpointI.h" \ "..\..\src\Ice\EndpointI.h" \ "..\..\src\Ice\TransceiverF.h" \ "..\..\src\Ice\AcceptorF.h" \ + "..\..\src\Ice\IPEndpointI.h" \ "..\..\src\Ice\EndpointFactory.h" \ "..\..\src\Ice\EndpointFactoryF.h" \ "..\..\src\Ice\WSEndpoint.h" \ @@ -905,6 +926,7 @@ RFC2253.obj: \ "$(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" \ @@ -913,6 +935,7 @@ RFC2253.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -950,7 +973,7 @@ RFC2253.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -978,6 +1001,7 @@ SChannelEngine.obj: \ "$(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" \ @@ -986,6 +1010,7 @@ SChannelEngine.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -1023,7 +1048,7 @@ SChannelEngine.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1045,6 +1070,7 @@ SChannelEngine.obj: \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1081,6 +1107,7 @@ SChannelTransceiverI.obj: \ "$(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" \ @@ -1089,6 +1116,7 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -1125,7 +1153,7 @@ SChannelTransceiverI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1177,6 +1205,7 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1214,6 +1243,7 @@ SSLEngine.obj: \ "$(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" \ @@ -1222,6 +1252,7 @@ SSLEngine.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -1259,7 +1290,7 @@ SSLEngine.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1282,6 +1313,7 @@ SSLEngine.obj: \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1314,6 +1346,7 @@ TrustManager.obj: \ "$(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" \ @@ -1322,6 +1355,7 @@ TrustManager.obj: \ "$(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" \ @@ -1362,7 +1396,7 @@ TrustManager.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1375,6 +1409,7 @@ TrustManager.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1418,6 +1453,7 @@ Util.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -1426,6 +1462,7 @@ Util.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -1459,7 +1496,7 @@ Util.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp index d8145b68153..795e1df4f3f 100644 --- a/cpp/src/IceSSL/Certificate.cpp +++ b/cpp/src/IceSSL/Certificate.cpp @@ -874,11 +874,11 @@ CertificatePtr Certificate::load(const string& file) { #if defined(ICE_USE_SECURE_TRANSPORT) - return new Certificate(loadCertificate(file)); + return ICE_MAKE_SHARED(Certificate, loadCertificate(file)); #elif defined(ICE_USE_SCHANNEL) CERT_SIGNED_CONTENT_INFO* cert; loadCertificate(&cert, file); - return new Certificate(cert); + return ICE_MAKE_SHARED(Certificate, cert); #else BIO *cert = BIO_new(BIO_s_file()); if(BIO_read_filename(cert, file.c_str()) <= 0) @@ -894,7 +894,7 @@ Certificate::load(const string& file) throw CertificateReadException(__FILE__, __LINE__, "error reading file:\n" + getSslErrors(false)); } BIO_free(cert); - return new Certificate(x); + return ICE_MAKE_SHARED(Certificate, x); #endif } @@ -925,11 +925,11 @@ Certificate::decode(const string& encoding) CFRelease(items); assert(SecCertificateGetTypeID() == CFGetTypeID(item)); - return new Certificate((SecCertificateRef)item); + return ICE_MAKE_SHARED(Certificate, (SecCertificateRef)item); #elif defined(ICE_USE_SCHANNEL) CERT_SIGNED_CONTENT_INFO* cert; loadCertificate(&cert, encoding.c_str(), static_cast(encoding.size())); - return new Certificate(cert); + return ICE_MAKE_SHARED(Certificate, cert); #else BIO *cert = BIO_new_mem_buf(static_cast(const_cast(&encoding[0])), static_cast(encoding.size())); X509CertificateRef x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL); @@ -939,7 +939,7 @@ Certificate::decode(const string& encoding) throw CertificateEncodingException(__FILE__, __LINE__, getSslErrors(false)); } BIO_free(cert); - return new Certificate(x); + return ICE_MAKE_SHARED(Certificate, x); #endif } @@ -977,11 +977,24 @@ Certificate::getPublicKey() const { throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err)); } +# ifdef ICE_CPP11_MAPPING + return make_shared(const_pointer_cast(shared_from_this()), key); +# else return new PublicKey(const_cast(this), key); +# endif #elif defined(ICE_USE_SCHANNEL) +# ifdef ICE_CPP11_MAPPING + return make_shared(const_pointer_cast(shared_from_this()), + &_certInfo->SubjectPublicKeyInfo); +# else return new PublicKey(const_cast(this), &_certInfo->SubjectPublicKeyInfo); +# endif #else +# ifdef ICE_CPP11_MAPPING + return make_shared(const_pointer_cast(shared_from_this()), X509_get_pubkey(_cert)); +# else return new PublicKey(const_cast(this), X509_get_pubkey(_cert)); +# endif #endif } diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index 6893db0e117..88e258f868b 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -21,7 +21,9 @@ using namespace std; using namespace Ice; using namespace IceSSL; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* IceSSL::upCast(EndpointI* p) { return p; } +#endif IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const string& ho, Int po, const IceInternal::Address& sourceAddr, Int ti, const string& conId, bool co) : @@ -53,7 +55,13 @@ IceSSL::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStre Ice::EndpointInfoPtr IceSSL::EndpointI::getInfo() const { +#ifdef ICE_CPP11_MAPPING + EndpointInfoPtr info = make_shared>( + dynamic_pointer_cast( + const_pointer_cast(shared_from_this()))); +#else EndpointInfoPtr info = new IceInternal::InfoI(const_cast(this)); +#endif fillEndpointInfo(info.get()); return info; } @@ -61,7 +69,13 @@ IceSSL::EndpointI::getInfo() const Ice::EndpointInfoPtr IceSSL::EndpointI::getWSInfo(const string& resource) const { +#ifdef ICE_CPP11_MAPPING + WSEndpointInfoPtr info = make_shared>( + dynamic_pointer_cast( + const_pointer_cast(shared_from_this()))); +#else WSSEndpointInfoPtr info = new IceInternal::InfoI(const_cast(this)); +#endif fillEndpointInfo(info.get()); info->resource = resource; return info; @@ -78,11 +92,15 @@ IceSSL::EndpointI::timeout(Int timeout) const { if(timeout == _timeout) { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } else { - return new EndpointI(_instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress); + return ICE_MAKE_SHARED(EndpointI, _instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress); } } @@ -97,11 +115,15 @@ IceSSL::EndpointI::compress(bool compress) const { if(compress == _compress) { +#ifdef ICE_CPP11_MAPPING + return dynamic_pointer_cast(const_pointer_cast(shared_from_this())); +#else return const_cast(this); +#endif } else { - return new EndpointI(_instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress); + return ICE_MAKE_SHARED(EndpointI, _instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress); } } @@ -120,13 +142,19 @@ IceSSL::EndpointI::transceiver() const IceInternal::AcceptorPtr IceSSL::EndpointI::acceptor(const string& adapterName) const { +#ifdef ICE_CPP11_MAPPING + return new AcceptorI( + dynamic_pointer_cast(const_pointer_cast(shared_from_this())), + _instance, adapterName, _host, _port); +#else return new AcceptorI(const_cast(this), _instance, adapterName, _host, _port); +#endif } EndpointIPtr IceSSL::EndpointI::endpoint(const AcceptorIPtr& acceptor) const { - return new EndpointI(_instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId, _compress); + return ICE_MAKE_SHARED(EndpointI, _instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId, _compress); } string @@ -160,7 +188,11 @@ IceSSL::EndpointI::options() const } bool +#ifdef ICE_CPP11_MAPPING +IceSSL::EndpointI::operator==(const IceInternal::EndpointI& r) const +#else IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const +#endif { if(!IPEndpointI::operator==(r)) { @@ -192,7 +224,11 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const } bool +#ifdef ICE_CPP11_MAPPING +IceSSL::EndpointI::operator<(const IceInternal::EndpointI& r) const +#else IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const +#endif { const EndpointI* p = dynamic_cast(&r); if(!p) @@ -319,7 +355,7 @@ IceSSL::EndpointI::createConnector(const IceInternal::Address& address, const Ic IceInternal::IPEndpointIPtr IceSSL::EndpointI::createEndpoint(const string& host, int port, const string& connectionId) const { - return new EndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress); + return ICE_MAKE_SHARED(EndpointI, _instance, host, port, _sourceAddr, _timeout, connectionId, _compress); } IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance) : _instance(instance) @@ -345,7 +381,7 @@ IceSSL::EndpointFactoryI::protocol() const IceInternal::EndpointIPtr IceSSL::EndpointFactoryI::create(vector& args, bool oaEndpoint) const { - IceInternal::IPEndpointIPtr endpt = new EndpointI(_instance); + IceInternal::IPEndpointIPtr endpt = ICE_MAKE_SHARED(EndpointI, _instance); endpt->initWithOptions(args, oaEndpoint); return endpt; } @@ -353,7 +389,7 @@ IceSSL::EndpointFactoryI::create(vector& args, bool oaEndpoint) const IceInternal::EndpointIPtr IceSSL::EndpointFactoryI::read(IceInternal::BasicStream* s) const { - return new EndpointI(_instance, s); + return ICE_MAKE_SHARED(EndpointI, _instance, s); } void diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index 74f04d1665a..25a23766b0b 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -10,6 +10,7 @@ #ifndef ICE_SSL_ENDPOINT_I_H #define ICE_SSL_ENDPOINT_I_H +#include #include #include #include @@ -42,8 +43,13 @@ public: virtual IceInternal::AcceptorPtr acceptor(const std::string&) const; virtual std::string options() const; +#ifdef ICE_CPP11_MAPPING + virtual bool operator==(const IceInternal::EndpointI&) const; + virtual bool operator<(const IceInternal::EndpointI&) const; +#else virtual bool operator==(const Ice::LocalObject&) const; virtual bool operator<(const Ice::LocalObject&) const; +#endif virtual EndpointIPtr endpoint(const AcceptorIPtr&) const; diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h index 0c216ce2e5d..78f5ec916fc 100644 --- a/cpp/src/IceSSL/InstanceF.h +++ b/cpp/src/IceSSL/InstanceF.h @@ -22,8 +22,12 @@ IceUtil::Shared* upCast(Instance*); typedef IceInternal::Handle InstancePtr; class EndpointI; +#ifdef ICE_CPP11_MAPPING +typedef ::std::shared_ptr EndpointIPtr; +#else IceUtil::Shared* upCast(EndpointI*); typedef IceInternal::Handle EndpointIPtr; +#endif class AcceptorI; IceUtil::Shared* upCast(AcceptorI*); diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp index ff9563db0de..22856132b76 100644 --- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp @@ -279,7 +279,11 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B _verified = true; } +#ifdef ICE_CPP11_MAPPING + _engine->verifyPeer(_stream->fd(), _host, dynamic_pointer_cast(getInfo())); +#else _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo())); +#endif if(_engine->securityTraceLevel() >= 1) { @@ -571,7 +575,7 @@ IceSSL::TransceiverI::toDetailedString() const Ice::ConnectionInfoPtr IceSSL::TransceiverI::getInfo() const { - NativeConnectionInfoPtr info = new NativeConnectionInfo(); + NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo); fillConnectionInfo(info, info->nativeCerts); return info; } @@ -579,7 +583,7 @@ IceSSL::TransceiverI::getInfo() const Ice::ConnectionInfoPtr IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const { - WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo(); + WSSNativeConnectionInfoPtr info = ICE_MAKE_SHARED(WSSNativeConnectionInfo); fillConnectionInfo(info, info->nativeCerts); info->headers = headers; return info; @@ -627,7 +631,7 @@ IceSSL::TransceiverI::verifyCallback(int ok, X509_STORE_CTX* c) _nativeCerts.clear(); for(int i = 0; i < sk_X509_num(chain); ++i) { - _nativeCerts.push_back(new Certificate(X509_dup(sk_X509_value(chain, i)))); + _nativeCerts.push_back(ICE_MAKE_SHARED(Certificate, X509_dup(sk_X509_value(chain, i)))); } sk_X509_pop_free(chain, X509_free); } diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp index 238bf3981da..792a283db8b 100644 --- a/cpp/src/IceSSL/SChannelTransceiverI.cpp +++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp @@ -715,7 +715,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B } } - _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo())); + _engine->verifyPeer(_stream->fd(), _host, ICE_DYNAMIC_CAST(NativeConnectionInfo, getInfo())); _state = StateHandshakeComplete; if(_instance->engine()->securityTraceLevel() >= 1) @@ -958,7 +958,7 @@ IceSSL::TransceiverI::toDetailedString() const Ice::ConnectionInfoPtr IceSSL::TransceiverI::getInfo() const { - NativeConnectionInfoPtr info = new NativeConnectionInfo(); + NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo); fillConnectionInfo(info, info->nativeCerts); return info; } @@ -966,7 +966,7 @@ IceSSL::TransceiverI::getInfo() const Ice::ConnectionInfoPtr IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const { - WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo(); + WSSNativeConnectionInfoPtr info = ICE_MAKE_SHARED(WSSNativeConnectionInfo); fillConnectionInfo(info, info->nativeCerts); info->headers = headers; return info; @@ -1051,7 +1051,7 @@ IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, vectorcerts.push_back(certificate->encode()); } diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp index 08bce7548a1..99f4571224e 100644 --- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp @@ -258,7 +258,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B << "remote address = " << desc << "\n" << errorToString(err); throw ProtocolException(__FILE__, __LINE__, os.str()); } - _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo())); + _engine->verifyPeer(_stream->fd(), _host, ICE_DYNAMIC_CAST(NativeConnectionInfo, getInfo())); if(_instance->engine()->securityTraceLevel() >= 1) { @@ -484,7 +484,7 @@ IceSSL::TransceiverI::toDetailedString() const Ice::ConnectionInfoPtr IceSSL::TransceiverI::getInfo() const { - NativeConnectionInfoPtr info = new NativeConnectionInfo(); + NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo); fillConnectionInfo(info, info->nativeCerts); return info; } @@ -492,7 +492,7 @@ IceSSL::TransceiverI::getInfo() const Ice::ConnectionInfoPtr IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const { - WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo(); + WSSNativeConnectionInfoPtr info = ICE_MAKE_SHARED(WSSNativeConnectionInfo); fillConnectionInfo(info, info->nativeCerts); info->headers = headers; return info; @@ -554,7 +554,7 @@ IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, std::vec SecCertificateRef cert = SecTrustGetCertificateAtIndex(_trust, i); CFRetain(cert); - CertificatePtr certificate = new Certificate(cert); + CertificatePtr certificate = ICE_MAKE_SHARED(Certificate, cert); nativeCerts.push_back(certificate); info->certs.push_back(certificate->encode()); } diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index e1aabecdb24..a2378c1a17a 100755 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak @@ -96,6 +96,7 @@ Instance.obj: \ "$(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" \ @@ -104,6 +105,7 @@ Instance.obj: \ "$(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" \ @@ -138,7 +140,7 @@ Instance.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -148,13 +150,13 @@ Instance.obj: \ "Election.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "SubscriberRecord.h" \ "$(includedir)\IceStorm\IceStorm.h" \ @@ -204,7 +206,6 @@ Instance.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -246,6 +247,7 @@ InstrumentationI.obj: \ "$(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" \ @@ -254,6 +256,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -289,7 +292,7 @@ InstrumentationI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -299,13 +302,13 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -372,6 +375,7 @@ NodeI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -379,6 +383,7 @@ NodeI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -407,7 +412,7 @@ NodeI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -420,6 +425,7 @@ NodeI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -431,7 +437,6 @@ NodeI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -453,7 +458,6 @@ NodeI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -494,6 +498,7 @@ Observers.obj: \ "$(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" \ @@ -502,6 +507,7 @@ Observers.obj: \ "$(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" \ @@ -542,7 +548,7 @@ Observers.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -556,6 +562,7 @@ Observers.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -567,7 +574,6 @@ Observers.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -590,7 +596,6 @@ Observers.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -632,6 +637,7 @@ Service.obj: \ "$(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" \ @@ -640,6 +646,7 @@ Service.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -679,7 +686,7 @@ Service.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -688,13 +695,13 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -743,7 +750,6 @@ Service.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -788,6 +794,7 @@ Subscriber.obj: \ "$(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" \ @@ -796,6 +803,7 @@ Subscriber.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -830,7 +838,7 @@ Subscriber.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -839,13 +847,13 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -899,7 +907,6 @@ Subscriber.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -930,6 +937,7 @@ TopicI.obj: \ "$(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" \ @@ -938,6 +946,7 @@ TopicI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -972,7 +981,7 @@ TopicI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -981,13 +990,13 @@ TopicI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -1039,7 +1048,6 @@ TopicI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1074,6 +1082,7 @@ TopicManagerI.obj: \ "$(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" \ @@ -1082,6 +1091,7 @@ TopicManagerI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1116,7 +1126,7 @@ TopicManagerI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1125,13 +1135,13 @@ TopicManagerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\Ice\Metrics.h" \ @@ -1178,7 +1188,6 @@ TopicManagerI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1219,6 +1228,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -1227,6 +1237,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1261,7 +1272,7 @@ TraceLevels.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1272,6 +1283,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1295,6 +1307,7 @@ TransientTopicI.obj: \ "$(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" \ @@ -1303,6 +1316,7 @@ TransientTopicI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1337,7 +1351,7 @@ TransientTopicI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1346,13 +1360,13 @@ TransientTopicI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -1405,7 +1419,6 @@ TransientTopicI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1433,6 +1446,7 @@ TransientTopicManagerI.obj: \ "$(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" \ @@ -1441,6 +1455,7 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1475,7 +1490,7 @@ TransientTopicManagerI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1484,13 +1499,13 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -1545,7 +1560,6 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1574,6 +1588,7 @@ Util.obj: \ "$(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" \ @@ -1582,6 +1597,7 @@ Util.obj: \ "$(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" \ @@ -1622,7 +1638,7 @@ Util.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1636,6 +1652,7 @@ Util.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -1647,7 +1664,6 @@ Util.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -1670,7 +1686,6 @@ Util.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -1704,6 +1719,7 @@ Election.obj: \ "$(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" \ @@ -1712,6 +1728,7 @@ Election.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1746,7 +1763,7 @@ Election.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1755,13 +1772,13 @@ Election.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "SubscriberRecord.h" \ "$(includedir)\IceStorm\IceStorm.h" \ @@ -1791,6 +1808,7 @@ IceStormInternal.obj: \ "$(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" \ @@ -1799,6 +1817,7 @@ IceStormInternal.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1833,7 +1852,7 @@ IceStormInternal.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1842,13 +1861,13 @@ IceStormInternal.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -1879,6 +1898,7 @@ Instrumentation.obj: \ "$(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" \ @@ -1887,6 +1907,7 @@ Instrumentation.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -1921,7 +1942,7 @@ Instrumentation.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -1930,13 +1951,13 @@ Instrumentation.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -1964,6 +1985,7 @@ LinkRecord.obj: \ "$(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" \ @@ -1972,6 +1994,7 @@ LinkRecord.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2006,7 +2029,7 @@ LinkRecord.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2015,13 +2038,13 @@ LinkRecord.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "IceStormInternal.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ @@ -2053,6 +2076,7 @@ LLURecord.obj: \ "$(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" \ @@ -2061,6 +2085,7 @@ LLURecord.obj: \ "$(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" \ @@ -2079,7 +2104,7 @@ LLURecord.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2101,6 +2126,7 @@ SubscriberRecord.obj: \ "$(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" \ @@ -2109,6 +2135,7 @@ SubscriberRecord.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2143,7 +2170,7 @@ SubscriberRecord.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2152,13 +2179,13 @@ SubscriberRecord.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -2195,6 +2222,7 @@ Admin.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2203,6 +2231,7 @@ Admin.obj: \ "$(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" \ @@ -2239,7 +2268,7 @@ Admin.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2253,6 +2282,7 @@ Admin.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2264,7 +2294,6 @@ Admin.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2286,7 +2315,6 @@ Admin.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2317,6 +2345,7 @@ Parser.obj: \ "$(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" \ @@ -2325,6 +2354,7 @@ Parser.obj: \ "$(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" \ @@ -2365,7 +2395,7 @@ Parser.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2379,6 +2409,7 @@ Parser.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2390,7 +2421,6 @@ Parser.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2413,7 +2443,6 @@ Parser.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2447,6 +2476,7 @@ Grammar.obj: \ "$(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" \ @@ -2455,6 +2485,7 @@ Grammar.obj: \ "$(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" \ @@ -2495,7 +2526,7 @@ Grammar.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2509,6 +2540,7 @@ Grammar.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2520,7 +2552,6 @@ Grammar.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2543,7 +2574,6 @@ Grammar.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2574,6 +2604,7 @@ Scanner.obj: \ "$(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" \ @@ -2582,6 +2613,7 @@ Scanner.obj: \ "$(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" \ @@ -2622,7 +2654,7 @@ Scanner.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2636,6 +2668,7 @@ Scanner.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2647,7 +2680,6 @@ Scanner.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2670,7 +2702,6 @@ Scanner.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2708,6 +2739,7 @@ IceStormDB.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -2716,6 +2748,7 @@ IceStormDB.obj: \ "$(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" \ @@ -2752,7 +2785,7 @@ IceStormDB.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2766,6 +2799,7 @@ IceStormDB.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -2777,7 +2811,6 @@ IceStormDB.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -2799,7 +2832,6 @@ IceStormDB.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -2835,6 +2867,7 @@ DBTypes.obj: \ "$(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" \ @@ -2843,6 +2876,7 @@ DBTypes.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2877,7 +2911,7 @@ DBTypes.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -2886,13 +2920,13 @@ DBTypes.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "SubscriberRecord.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak index 90076091925..de2c3789856 100755 --- a/cpp/src/IceStormLib/.depend.mak +++ b/cpp/src/IceStormLib/.depend.mak @@ -26,6 +26,7 @@ IceStorm.obj: \ "$(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" \ @@ -34,6 +35,7 @@ IceStorm.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -68,7 +70,7 @@ IceStorm.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -77,13 +79,13 @@ IceStorm.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\Ice\Metrics.h" \ @@ -111,6 +113,7 @@ Metrics.obj: \ "$(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" \ @@ -119,6 +122,7 @@ Metrics.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -153,7 +157,7 @@ Metrics.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -162,13 +166,13 @@ Metrics.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/src/Makefile b/cpp/src/Makefile index 7ed1b7f07f8..0b4354e707a 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -11,6 +11,14 @@ top_srcdir = .. include $(top_srcdir)/config/Make.rules +ifeq ($(CPP11_MAPPING),yes) + SUBDIRS = IceUtil \ + Slice \ + slice2cpp \ + Ice \ + IceSSL +else + ifneq ($(findstring MINGW,$(UNAME)),) SUBDIRS = IceUtil \ Slice \ @@ -51,6 +59,7 @@ endif IceStorm \ IceGrid endif +endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak index daefee51925..204980bcc3e 100644 --- a/cpp/src/Makefile.mak +++ b/cpp/src/Makefile.mak @@ -18,7 +18,12 @@ SUBDIRS_WINRT = IceUtil\winrt \ Glacier2Lib\winrt \ IceStormLib\winrt \ IceGridLib\winrt - +!elseif "$(CPP11_MAPPING)" == "yes" +SUBDIRS = IceUtil \ + Slice \ + slice2cpp \ + Ice \ + IceSSL !elseif "$(CPP_COMPILER)" == "VC100" SUBDIRS = IceUtil \ Slice \ diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index e50b4908eab..474976e89f0 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -48,14 +48,7 @@ stringTypeToString(const TypePtr& type, const StringList& metaData, int typeCtx) string strType = findMetaData(metaData, typeCtx); if(strType == "wstring" || (typeCtx & TypeContextUseWstring && strType == "")) { - if(featureProfile == IceE) - { - return "::Ice::Wstring"; - } - else - { - return "::std::wstring"; - } + return "::std::wstring"; } else if(strType != "" && strType != "string") { @@ -151,9 +144,9 @@ dictionaryTypeToString(const DictionaryPtr& dict, const StringList& metaData, in void writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const string& fixedName, - const StringList& metaData, int typeCtx, bool endArg) + const StringList& metaData, int typeCtx, bool cpp11, bool endArg) { - string s = typeToString(type, metaData, typeCtx); + string s = typeToString(type, metaData, typeCtx, cpp11); if(optional) { s = "IceUtil::Optional<" + toTemplateArg(s) + '>'; @@ -181,7 +174,7 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st string s; if(seqType == "%array") { - s = typeToString(seq, metaData, TypeContextAMIPrivateEnd); + s = typeToString(seq, metaData, TypeContextAMIPrivateEnd, cpp11); } else if(seqType.find("%range") == 0) { @@ -190,7 +183,7 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st { md.push_back("cpp:type:" + seqType.substr(strlen("%range:"))); } - s = typeToString(seq, md); + s = typeToString(seq, md, 0, cpp11); } if(!s.empty()) @@ -450,9 +443,33 @@ Slice::printDllExportStuff(Output& out, const string& dllExport) } } +bool +Slice::isMovable(const TypePtr& type) +{ + BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); + if(builtin) + { + switch(builtin->kind()) + { + case Builtin::KindString: + case Builtin::KindObject: + case Builtin::KindObjectProxy: + case Builtin::KindLocalObject: + case Builtin::KindValue: + { + return true; + } + default: + { + return false; + } + } + } + return !EnumPtr::dynamicCast(type); +} string -Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx) +Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx, bool cpp11) { static const char* builtinTable[] = { @@ -466,7 +483,24 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx "::std::string", "::Ice::ObjectPtr", "::Ice::ObjectPrx", - "::Ice::LocalObjectPtr" + "::Ice::LocalObjectPtr", + "::Ice::ValuePtr" + }; + + static const char* cpp11BuiltinTable[] = + { + "::Ice::Byte", + "bool", + "short", + "int", + "long long int", + "float", + "double", + "::std::string", + "::std::shared_ptr<::Ice::Object>", + "::std::shared_ptr<::Ice::ObjectPrx>", + "::std::shared_ptr", + "::std::shared_ptr<::Ice::Value>" }; BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); @@ -478,20 +512,48 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx } else { - return builtinTable[builtin->kind()]; + return cpp11 ? cpp11BuiltinTable[builtin->kind()] : builtinTable[builtin->kind()]; } } ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type); if(cl) { - return fixKwd(cl->scoped() + "Ptr"); + // + // C++11 mapping accepts cpp11:type metadata for classes and proxies + // + if(cpp11) + { + string t; + if(cpp11 && findMetaData("cpp11:type:", cl, t)) + { + return t; + } + else + { + if(cl->isInterface() && !cl->isLocal()) + { + return "std::shared_ptr<::Ice::Value>"; + } + else + { + return "::std::shared_ptr<" + cl->scoped() + ">"; + } + } + } + else + { + return cl->scoped() + "Ptr"; + } } StructPtr st = StructPtr::dynamicCast(type); if(st) { - if(findMetaData(st->getMetaData()) == "%class") + // + // C++11 mapping doesn't accept cpp:class metdata + // + if(!cpp11 && findMetaData(st->getMetaData()) == "%class") { return fixKwd(st->scoped() + "Ptr"); } @@ -501,7 +563,14 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx ProxyPtr proxy = ProxyPtr::dynamicCast(type); if(proxy) { - return fixKwd(proxy->_class()->scoped() + "Prx"); + if(cpp11) + { + return "::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx") + ">"; + } + else + { + return fixKwd(proxy->_class()->scoped() + "Prx"); + } } SequencePtr seq = SequencePtr::dynamicCast(type); @@ -532,7 +601,7 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx } string -Slice::typeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx) +Slice::typeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11) { if(optional) { @@ -540,12 +609,12 @@ Slice::typeToString(const TypePtr& type, bool optional, const StringList& metaDa } else { - return typeToString(type, metaData, typeCtx); + return typeToString(type, metaData, typeCtx, cpp11); } } string -Slice::returnTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx) +Slice::returnTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11) { if(!type) { @@ -557,11 +626,11 @@ Slice::returnTypeToString(const TypePtr& type, bool optional, const StringList& return "IceUtil::Optional<" + toTemplateArg(typeToString(type, metaData, typeCtx)) + ">"; } - return typeToString(type, metaData, typeCtx); + return typeToString(type, metaData, typeCtx, cpp11); } string -Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx) +Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11) { static const char* inputBuiltinTable[] = { @@ -575,7 +644,24 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m "const ::std::string&", "const ::Ice::ObjectPtr&", "const ::Ice::ObjectPrx&", - "const ::Ice::LocalObjectPtr&" + "const ::Ice::LocalObjectPtr&", + "const ::Ice::ValuePtr&" + }; + + static const char* cpp1InputBuiltinTable[] = + { + "::Ice::Byte", + "bool", + "short", + "int", + "long long int", + "float", + "double", + "const ::std::string&", + "const ::Ice::ObjectPtr&", + "const ::std::shared_ptr<::Ice::ObjectPrx>&", + "const ::std::shared_ptr&", + "const ::Ice::ValuePtr&" }; typeCtx |= TypeContextInParam; @@ -594,20 +680,39 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m } else { - return inputBuiltinTable[builtin->kind()]; + return cpp11 ? cpp1InputBuiltinTable[builtin->kind()] : inputBuiltinTable[builtin->kind()]; } } ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type); if(cl) { - return "const " + fixKwd(cl->scoped() + "Ptr&"); + string t; + if(cpp11) + { + if(findMetaData("cpp11:type:", cl, t)) + { + return t; + } + else if(cl->isInterface() && !cl->isLocal()) + { + return "const ::Ice::ValuePtr&"; + } + else + { + return "const ::std::shared_ptr<" + fixKwd(cl->scoped()) + ">&"; + } + } + else + { + return "const " + fixKwd(cl->scoped() + "Ptr&"); + } } StructPtr st = StructPtr::dynamicCast(type); if(st) { - if(findMetaData(st->getMetaData()) == "%class") + if(!cpp11 && findMetaData(st->getMetaData()) == "%class") { return "const " + fixKwd(st->scoped() + "Ptr&"); } @@ -617,7 +722,14 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m ProxyPtr proxy = ProxyPtr::dynamicCast(type); if(proxy) { - return "const " + fixKwd(proxy->_class()->scoped() + "Prx&"); + if(cpp11) + { + return "const ::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx") + ">&"; + } + else + { + return "const " + fixKwd(proxy->_class()->scoped() + "Prx&"); + } } EnumPtr en = EnumPtr::dynamicCast(type); @@ -648,7 +760,7 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m } string -Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx) +Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11) { static const char* outputBuiltinTable[] = { @@ -661,8 +773,25 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& "::Ice::Double&", "::std::string&", "::Ice::ObjectPtr&", - "::Ice::ObjectPrx&", - "::Ice::LocalObjectPtr&" + "::Ice::ObjectPrxPtr&", + "::Ice::LocalObjectPtr&", + "::Ice::ValuePtr&" + }; + + static const char* cpp11OutputBuiltinTable[] = + { + "::Ice::Byte&", + "bool&", + "short&", + "int&", + "long long int&", + "float&", + "double&", + "::std::string&", + "::std::shared_ptr<::Ice::Object>&", + "::std::shared_ptr<::Ice::ObjectPrx>&", + "::std::shared_ptr&", + "::std::shared_ptr<::Ice::Value>&" }; if(optional) @@ -679,30 +808,54 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& } else { - return outputBuiltinTable[builtin->kind()]; + return cpp11 ? cpp11OutputBuiltinTable[builtin->kind()] : outputBuiltinTable[builtin->kind()]; } } ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type); if(cl) { - return fixKwd(cl->scoped() + "Ptr&"); + if(cpp11) + { + if(cl->isInterface() && !cl->isLocal()) + { + return "::std::shared_ptr<::Ice::Value>&"; + } + else + { + return "::std::shared_ptr<" + fixKwd(cl->scoped()) + ">&"; + } + } + else + { + return fixKwd(cl->scoped() + "Ptr&"); + } } StructPtr st = StructPtr::dynamicCast(type); if(st) { - if(findMetaData(st->getMetaData()) == "%class") + if(!cpp11 && findMetaData(st->getMetaData()) == "%class") { return fixKwd(st->scoped() + "Ptr&"); } - return fixKwd(st->scoped()) + "&"; + else + { + return fixKwd(st->scoped()) + "&"; + } } ProxyPtr proxy = ProxyPtr::dynamicCast(type); if(proxy) { - return fixKwd(proxy->_class()->scoped() + "Prx&"); + if(cpp11) + { + return "::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx>&"); + } + else + { + return fixKwd(proxy->_class()->scoped() + "Prx&"); + } } SequencePtr seq = SequencePtr::dynamicCast(type); @@ -727,23 +880,23 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& } string -Slice::operationModeToString(Operation::Mode mode) +Slice::operationModeToString(Operation::Mode mode, bool cpp11) { switch(mode) { case Operation::Normal: { - return "::Ice::Normal"; + return cpp11 ? "::Ice::OperationMode::Normal" : "::Ice::Normal"; } case Operation::Nonmutating: { - return "::Ice::Nonmutating"; + return cpp11 ? "::Ice::OperationMode::Nonmutating" : "::Ice::Nonmutating"; } case Operation::Idempotent: { - return "::Ice::Idempotent"; + return cpp11 ? "::Ice::OperationMode::Idempotent" : "::Ice::Idempotent"; } default: @@ -949,17 +1102,17 @@ Slice::writeUnmarshalCode(Output& out, const ParamDeclList& params, const Operat } void -Slice::writeAllocateCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx) +Slice::writeAllocateCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx, bool cpp11) { string prefix = prepend ? paramPrefix : ""; for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p) { writeParamAllocateCode(out, (*p)->type(), (*p)->optional(), fixKwd(prefix + (*p)->name()), (*p)->getMetaData(), - typeCtx, getEndArg((*p)->type(),(*p)->getMetaData(), (*p)->name()) != (*p)->name()); + typeCtx, cpp11, getEndArg((*p)->type(),(*p)->getMetaData(), (*p)->name()) != (*p)->name()); } if(op && op->returnType()) { - writeParamAllocateCode(out, op->returnType(), op->returnIsOptional(), "__ret", op->getMetaData(), typeCtx, + writeParamAllocateCode(out, op->returnType(), op->returnIsOptional(), "__ret", op->getMetaData(), typeCtx, cpp11, getEndArg(op->returnType(), op->getMetaData(), "__ret") != "__ret"); } } @@ -1020,6 +1173,33 @@ Slice::writeEndCode(Output& out, const ParamDeclList& params, const OperationPtr } } +bool +Slice::findMetaData(const string& prefix, const ClassDeclPtr& cl, string& value) +{ + if(findMetaData(prefix, cl->getMetaData(), value)) + { + return true; + } + + ClassDefPtr def = cl->definition(); + return def ? findMetaData(prefix, def->getMetaData(), value) : false; +} + +bool +Slice::findMetaData(const string& prefix, const StringList& metaData, string& value) +{ + for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); i++) + { + string s = *i; + if(s.find(prefix) == 0) + { + value = s.substr(prefix.size()); + return true; + } + } + return false; +} + string Slice::findMetaData(const StringList& metaData, int typeCtx) { @@ -1084,7 +1264,7 @@ Slice::findMetaData(const StringList& metaData, int typeCtx) } } // - // Otherwise if the data is "class" it is returned. + // Otherwise if the data is "class", "unscoped" it is returned. // else { @@ -1093,6 +1273,10 @@ Slice::findMetaData(const StringList& metaData, int typeCtx) { return "%class"; } + else if(ss == "unscoped") + { + return "%unscoped"; + } } } } diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index c72137ae53c..a1ab2fc869a 100644 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -191,6 +191,10 @@ Slice::CsGenerator::getOptionalFormat(const TypePtr& type) assert(false); break; } + case Builtin::KindValue: + { + return "Ice.OptionalFormat.Class"; + } } } @@ -552,6 +556,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, break; } case Builtin::KindObject: + case Builtin::KindValue: { if(marshal) { @@ -835,6 +840,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out, break; } case Builtin::KindObject: + case Builtin::KindValue: { if(marshal) { @@ -1138,6 +1144,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, { switch(builtin->kind()) { + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: { @@ -1170,7 +1177,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, << "> e__ = " << param << ".GetEnumerator();"; out << nl << "while(e__.MoveNext())"; out << sb; - string func = builtin->kind() == Builtin::KindObject ? "writeObject" : "writeProxy"; + string func = (builtin->kind() == Builtin::KindObject || + builtin->kind() == Builtin::KindValue) ? "writeObject" : "writeProxy"; out << nl << stream << '.' << func << "(e__.Current);"; out << eb; } @@ -1179,7 +1187,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, { out << nl << "for(int ix__ = 0; ix__ < " << param << '.' << limitID << "; ++ix__)"; out << sb; - string func = builtin->kind() == Builtin::KindObject ? "writeObject" : "writeProxy"; + string func = (builtin->kind() == Builtin::KindObject || + builtin->kind() == Builtin::KindValue) ? "writeObject" : "writeProxy"; out << nl << stream << '.' << func << '(' << param << "[ix__]);"; out << eb; } @@ -1190,7 +1199,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, out << nl << "int " << param << "_lenx = " << stream << ".readAndCheckSeqSize(" << static_cast(builtin->minWireSize()) << ");"; out << nl << param << " = new "; - if(builtin->kind() == Builtin::KindObject) + if((builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) { if(isArray) { @@ -1953,6 +1962,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out, break; } + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: { @@ -2200,6 +2210,7 @@ Slice::CsGenerator::writeSerializeDeserializeCode(Output &out, } break; } + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindLocalObject: { @@ -2530,7 +2541,8 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) { ClassDeclPtr cd = ClassDeclPtr::dynamicCast(seq->type()); BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type()); - if(!cd && !(builtin && builtin->kind() == Builtin::KindObject)) + if(!cd && !(builtin && (builtin->kind() == Builtin::KindObject || + builtin->kind() == Builtin::KindValue))) { continue; } diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp index 6e998481aae..6dbff21edc6 100644 --- a/cpp/src/Slice/Grammar.cpp +++ b/cpp/src/Slice/Grammar.cpp @@ -1,21 +1,19 @@ +/* A Bison parser, made by GNU Bison 3.0.2. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* Bison implementation for Yacc-like parsers in C + + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -28,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -46,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "3.0.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -60,23 +58,17 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ #define yyparse slice_parse #define yylex slice_lex #define yyerror slice_error -#define yylval slice_lval -#define yychar slice_char #define yydebug slice_debug #define yynerrs slice_nerrs /* Copy the first part of user declarations. */ - -/* Line 189 of yacc.c */ -#line 1 "../Slice/Grammar.y" +#line 1 "../Slice/Grammar.y" /* yacc.c:339 */ // ********************************************************************** @@ -119,23 +111,24 @@ slice_error(const char* s) if (strcmp(s, "parse error") == 0) { - unit->error("syntax error"); + unit->error("syntax error"); } else { - unit->error(s); + unit->error(s); } } +#line 124 "Grammar.tab.c" /* yacc.c:339 */ -/* Line 189 of yacc.c */ -#line 134 "Grammar.tab.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +# ifndef YY_NULLPTR +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -145,78 +138,85 @@ slice_error(const char* s) # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "Grammar.tab.h". */ +#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED +# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int slice_debug; #endif - -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - ICE_MODULE = 258, - ICE_CLASS = 259, - ICE_INTERFACE = 260, - ICE_EXCEPTION = 261, - ICE_STRUCT = 262, - ICE_SEQUENCE = 263, - ICE_DICTIONARY = 264, - ICE_ENUM = 265, - ICE_OUT = 266, - ICE_EXTENDS = 267, - ICE_IMPLEMENTS = 268, - ICE_THROWS = 269, - ICE_VOID = 270, - ICE_BYTE = 271, - ICE_BOOL = 272, - ICE_SHORT = 273, - ICE_INT = 274, - ICE_LONG = 275, - ICE_FLOAT = 276, - ICE_DOUBLE = 277, - ICE_STRING = 278, - ICE_OBJECT = 279, - ICE_LOCAL_OBJECT = 280, - ICE_LOCAL = 281, - ICE_CONST = 282, - ICE_FALSE = 283, - ICE_TRUE = 284, - ICE_IDEMPOTENT = 285, - ICE_OPTIONAL = 286, - ICE_SCOPE_DELIMITER = 287, - ICE_IDENTIFIER = 288, - ICE_STRING_LITERAL = 289, - ICE_INTEGER_LITERAL = 290, - ICE_FLOATING_POINT_LITERAL = 291, - ICE_IDENT_OP = 292, - ICE_KEYWORD_OP = 293, - ICE_OPTIONAL_OP = 294, - ICE_METADATA_OPEN = 295, - ICE_METADATA_CLOSE = 296, - ICE_GLOBAL_METADATA_OPEN = 297, - ICE_GLOBAL_METADATA_CLOSE = 298, - BAD_CHAR = 299 - }; + enum yytokentype + { + ICE_MODULE = 258, + ICE_CLASS = 259, + ICE_INTERFACE = 260, + ICE_EXCEPTION = 261, + ICE_STRUCT = 262, + ICE_SEQUENCE = 263, + ICE_DICTIONARY = 264, + ICE_ENUM = 265, + ICE_OUT = 266, + ICE_EXTENDS = 267, + ICE_IMPLEMENTS = 268, + ICE_THROWS = 269, + ICE_VOID = 270, + ICE_BYTE = 271, + ICE_BOOL = 272, + ICE_SHORT = 273, + ICE_INT = 274, + ICE_LONG = 275, + ICE_FLOAT = 276, + ICE_DOUBLE = 277, + ICE_STRING = 278, + ICE_OBJECT = 279, + ICE_LOCAL_OBJECT = 280, + ICE_LOCAL = 281, + ICE_CONST = 282, + ICE_FALSE = 283, + ICE_TRUE = 284, + ICE_IDEMPOTENT = 285, + ICE_OPTIONAL = 286, + ICE_VALUE = 287, + ICE_SCOPE_DELIMITER = 288, + ICE_IDENTIFIER = 289, + ICE_STRING_LITERAL = 290, + ICE_INTEGER_LITERAL = 291, + ICE_FLOATING_POINT_LITERAL = 292, + ICE_IDENT_OP = 293, + ICE_KEYWORD_OP = 294, + ICE_OPTIONAL_OP = 295, + ICE_METADATA_OPEN = 296, + ICE_METADATA_CLOSE = 297, + ICE_GLOBAL_METADATA_OPEN = 298, + ICE_GLOBAL_METADATA_CLOSE = 299, + BAD_CHAR = 300 + }; #endif - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -/* Copy the second part of user declarations. */ +int slice_parse (void); -/* Line 264 of yacc.c */ -#line 220 "Grammar.tab.c" +#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED */ + +/* Copy the second part of user declarations. */ + +#line 220 "Grammar.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -230,11 +230,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -254,8 +251,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -266,41 +262,70 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END #endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + #if ! defined yyoverflow || YYERROR_VERBOSE @@ -319,11 +344,11 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -331,8 +356,8 @@ YYID (yyi) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -346,25 +371,23 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -374,7 +397,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -392,79 +415,85 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 13 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 886 +#define YYLAST 920 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 54 +#define YYNTOKENS 55 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 72 /* YYNRULES -- Number of rules. */ -#define YYNRULES 202 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 301 +#define YYNRULES 205 +/* YYNSTATES -- Number of states. */ +#define YYNSTATES 304 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 299 +#define YYMAXUTOK 300 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 48, 53, 2, 50, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 45, - 51, 49, 52, 2, 2, 2, 2, 2, 2, 2, + 2, 49, 54, 2, 51, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, + 52, 50, 53, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 46, 2, 47, 2, 2, 2, 2, + 2, 2, 2, 47, 2, 48, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -481,129 +510,39 @@ static const yytype_uint8 yytranslate[] = 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45 }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 5, 9, 13, 14, 15, 19, 20, - 26, 27, 32, 35, 36, 38, 40, 42, 44, 46, - 48, 50, 52, 54, 56, 58, 60, 62, 63, 70, - 73, 76, 79, 80, 88, 91, 92, 97, 101, 104, - 105, 108, 112, 116, 119, 121, 124, 126, 128, 131, - 134, 137, 138, 145, 150, 154, 157, 158, 160, 163, - 166, 171, 176, 178, 181, 182, 191, 194, 195, 198, - 199, 204, 208, 211, 212, 214, 218, 221, 223, 225, - 229, 232, 237, 240, 242, 245, 247, 249, 252, 256, - 259, 263, 264, 270, 271, 277, 279, 281, 284, 287, - 290, 291, 299, 303, 305, 307, 310, 311, 316, 320, - 323, 324, 326, 330, 332, 334, 336, 344, 352, 363, - 374, 377, 380, 381, 388, 394, 398, 400, 402, 406, - 408, 409, 411, 413, 415, 416, 417, 421, 427, 432, - 439, 443, 449, 452, 453, 455, 458, 462, 464, 466, - 468, 470, 472, 474, 476, 478, 480, 483, 485, 487, - 490, 493, 495, 499, 501, 503, 504, 506, 508, 510, - 512, 514, 516, 523, 529, 531, 533, 535, 537, 539, - 541, 543, 545, 547, 549, 551, 553, 555, 557, 559, - 561, 563, 565, 567, 569, 571, 573, 575, 577, 579, - 581, 583, 585 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 55, 0, -1, 58, -1, 42, 121, 43, -1, 40, - 121, 41, -1, -1, -1, 56, 59, 58, -1, -1, - 57, 62, 60, 45, 58, -1, -1, 1, 45, 61, - 58, -1, 57, 62, -1, -1, 63, -1, 83, -1, - 84, -1, 98, -1, 99, -1, 66, -1, 67, -1, - 76, -1, 77, -1, 107, -1, 108, -1, 110, -1, - 124, -1, -1, 3, 33, 64, 46, 58, 47, -1, - 6, 33, -1, 6, 125, -1, 122, 65, -1, -1, - 122, 65, 69, 68, 46, 70, 47, -1, 12, 118, - -1, -1, 57, 74, 45, 70, -1, 1, 45, 70, - -1, 57, 74, -1, -1, 119, 33, -1, 39, 35, - 48, -1, 39, 118, 48, -1, 39, 48, -1, 31, - -1, 72, 71, -1, 71, -1, 89, -1, 7, 33, - -1, 7, 125, -1, 122, 75, -1, -1, 122, 75, - 78, 46, 79, 47, -1, 57, 80, 45, 79, -1, - 1, 45, 79, -1, 57, 80, -1, -1, 90, -1, - 4, 33, -1, 4, 125, -1, 4, 37, 35, 48, - -1, 4, 37, 118, 48, -1, 81, -1, 122, 81, - -1, -1, 122, 82, 86, 87, 85, 46, 88, 47, - -1, 12, 118, -1, -1, 13, 101, -1, -1, 57, - 96, 45, 88, -1, 1, 45, 88, -1, 57, 96, - -1, -1, 73, -1, 73, 49, 123, -1, 119, 125, - -1, 119, -1, 71, -1, 71, 49, 123, -1, 72, - 71, -1, 72, 71, 49, 123, -1, 119, 125, -1, - 119, -1, 72, 119, -1, 119, -1, 15, -1, 91, - 37, -1, 30, 91, 37, -1, 91, 38, -1, 30, - 91, 38, -1, -1, 92, 116, 48, 94, 117, -1, - -1, 92, 1, 48, 95, 117, -1, 89, -1, 93, - -1, 5, 33, -1, 5, 125, -1, 122, 97, -1, - -1, 122, 97, 102, 100, 46, 103, 47, -1, 118, - 50, 101, -1, 118, -1, 24, -1, 12, 101, -1, - -1, 57, 104, 45, 103, -1, 1, 45, 103, -1, - 57, 104, -1, -1, 93, -1, 106, 50, 105, -1, - 106, -1, 118, -1, 125, -1, 122, 8, 51, 57, - 119, 52, 33, -1, 122, 8, 51, 57, 119, 52, - 125, -1, 122, 9, 51, 57, 119, 50, 57, 119, - 52, 33, -1, 122, 9, 51, 57, 119, 50, 57, - 119, 52, 125, -1, 10, 33, -1, 10, 125, -1, - -1, 122, 109, 111, 46, 112, 47, -1, 122, 10, - 46, 112, 47, -1, 113, 50, 112, -1, 113, -1, - 33, -1, 33, 49, 114, -1, 125, -1, -1, 35, - -1, 118, -1, 11, -1, -1, -1, 115, 57, 73, - -1, 116, 50, 115, 57, 73, -1, 115, 57, 119, - 125, -1, 116, 50, 115, 57, 119, 125, -1, 115, - 57, 119, -1, 116, 50, 115, 57, 119, -1, 14, - 105, -1, -1, 33, -1, 32, 33, -1, 118, 32, - 33, -1, 16, -1, 17, -1, 18, -1, 19, -1, - 20, -1, 21, -1, 22, -1, 23, -1, 24, -1, - 24, 53, -1, 25, -1, 118, -1, 118, 53, -1, - 34, 120, -1, 34, -1, 121, 50, 120, -1, 120, - -1, 26, -1, -1, 35, -1, 36, -1, 118, -1, - 34, -1, 28, -1, 29, -1, 27, 57, 119, 33, - 49, 123, -1, 27, 57, 119, 49, 123, -1, 3, - -1, 4, -1, 5, -1, 6, -1, 7, -1, 8, - -1, 9, -1, 10, -1, 11, -1, 12, -1, 13, - -1, 14, -1, 15, -1, 16, -1, 17, -1, 18, - -1, 19, -1, 20, -1, 21, -1, 22, -1, 23, - -1, 24, -1, 25, -1, 26, -1, 27, -1, 28, - -1, 29, -1, 30, -1, 31, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 114, 114, 122, 131, 136, 145, 144, 154, 153, - 164, 163, 168, 173, 180, 184, 188, 192, 196, 200, - 204, 208, 212, 216, 220, 224, 228, 238, 237, 271, - 275, 286, 297, 296, 323, 332, 340, 349, 352, 357, - 364, 377, 397, 453, 461, 474, 482, 497, 503, 507, - 518, 529, 528, 570, 579, 582, 587, 594, 600, 604, - 615, 640, 705, 717, 731, 730, 770, 805, 813, 818, - 826, 835, 838, 843, 850, 872, 899, 921, 947, 956, - 967, 976, 985, 995, 1009, 1015, 1023, 1035, 1059, 1084, - 1108, 1139, 1138, 1161, 1160, 1183, 1184, 1190, 1194, 1205, - 1220, 1219, 1254, 1289, 1324, 1334, 1339, 1347, 1356, 1359, - 1364, 1371, 1377, 1384, 1396, 1408, 1419, 1428, 1443, 1454, - 1471, 1475, 1487, 1486, 1510, 1525, 1531, 1539, 1551, 1574, - 1582, 1591, 1595, 1634, 1641, 1652, 1654, 1670, 1686, 1698, - 1710, 1721, 1737, 1742, 1750, 1753, 1759, 1772, 1776, 1780, - 1784, 1788, 1792, 1796, 1800, 1804, 1808, 1812, 1816, 1835, - 1876, 1882, 1890, 1897, 1909, 1916, 1926, 1939, 1952, 1998, - 2009, 2020, 2036, 2045, 2059, 2062, 2065, 2068, 2071, 2074, - 2077, 2080, 2083, 2086, 2089, 2092, 2095, 2098, 2101, 2104, - 2107, 2110, 2113, 2116, 2119, 2122, 2125, 2128, 2131, 2134, - 2137, 2140, 2143 + 0, 115, 115, 123, 132, 137, 146, 145, 155, 154, + 165, 164, 169, 174, 181, 185, 189, 193, 197, 201, + 205, 209, 213, 217, 221, 225, 229, 239, 238, 272, + 276, 287, 298, 297, 324, 333, 341, 350, 353, 358, + 365, 378, 398, 454, 462, 475, 483, 498, 504, 508, + 519, 530, 529, 571, 580, 583, 588, 595, 601, 605, + 616, 641, 706, 718, 732, 731, 771, 806, 814, 819, + 827, 836, 839, 844, 851, 873, 900, 922, 948, 957, + 968, 977, 986, 996, 1010, 1016, 1024, 1036, 1060, 1085, + 1109, 1140, 1139, 1162, 1161, 1184, 1185, 1191, 1195, 1206, + 1221, 1220, 1255, 1290, 1325, 1330, 1340, 1345, 1353, 1362, + 1365, 1370, 1377, 1383, 1390, 1402, 1414, 1425, 1434, 1449, + 1460, 1477, 1481, 1493, 1492, 1516, 1531, 1537, 1545, 1557, + 1580, 1588, 1597, 1601, 1640, 1647, 1658, 1660, 1676, 1692, + 1704, 1716, 1727, 1743, 1748, 1756, 1759, 1765, 1778, 1782, + 1786, 1790, 1794, 1798, 1802, 1806, 1810, 1814, 1818, 1822, + 1826, 1845, 1886, 1892, 1900, 1907, 1919, 1926, 1936, 1949, + 1962, 2008, 2019, 2030, 2046, 2055, 2069, 2072, 2075, 2078, + 2081, 2084, 2087, 2090, 2093, 2096, 2099, 2102, 2105, 2108, + 2111, 2114, 2117, 2120, 2123, 2126, 2129, 2132, 2135, 2138, + 2141, 2144, 2147, 2150, 2153, 2156 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -614,7 +553,7 @@ static const char *const yytname[] = "ICE_THROWS", "ICE_VOID", "ICE_BYTE", "ICE_BOOL", "ICE_SHORT", "ICE_INT", "ICE_LONG", "ICE_FLOAT", "ICE_DOUBLE", "ICE_STRING", "ICE_OBJECT", "ICE_LOCAL_OBJECT", "ICE_LOCAL", "ICE_CONST", "ICE_FALSE", "ICE_TRUE", - "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_SCOPE_DELIMITER", + "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_VALUE", "ICE_SCOPE_DELIMITER", "ICE_IDENTIFIER", "ICE_STRING_LITERAL", "ICE_INTEGER_LITERAL", "ICE_FLOATING_POINT_LITERAL", "ICE_IDENT_OP", "ICE_KEYWORD_OP", "ICE_OPTIONAL_OP", "ICE_METADATA_OPEN", "ICE_METADATA_CLOSE", @@ -635,495 +574,456 @@ static const char *const yytname[] = "dictionary_def", "enum_id", "enum_def", "@11", "enumerator_list", "enumerator", "enumerator_initializer", "out_qualifier", "parameters", "throws", "scoped_name", "type", "string_literal", "string_list", - "local_qualifier", "const_initializer", "const_def", "keyword", 0 + "local_qualifier", "const_initializer", "const_def", "keyword", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 59, 123, 125, 41, 61, - 44, 60, 62, 42 + 295, 296, 297, 298, 299, 300, 59, 123, 125, 41, + 61, 44, 60, 62, 42 }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 54, 55, 56, 57, 57, 59, 58, 60, 58, - 61, 58, 58, 58, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 64, 63, 65, - 65, 66, 68, 67, 69, 69, 70, 70, 70, 70, - 71, 72, 72, 72, 72, 73, 73, 74, 75, 75, - 76, 78, 77, 79, 79, 79, 79, 80, 81, 81, - 82, 82, 82, 83, 85, 84, 86, 86, 87, 87, - 88, 88, 88, 88, 89, 89, 89, 89, 90, 90, - 90, 90, 90, 90, 91, 91, 91, 92, 92, 92, - 92, 94, 93, 95, 93, 96, 96, 97, 97, 98, - 100, 99, 101, 101, 101, 102, 102, 103, 103, 103, - 103, 104, 105, 105, 106, 106, 107, 107, 108, 108, - 109, 109, 111, 110, 110, 112, 112, 113, 113, 113, - 113, 114, 114, 115, 115, 116, 116, 116, 116, 116, - 116, 116, 117, 117, 118, 118, 118, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 120, 120, 121, 121, 122, 122, 123, 123, 123, 123, - 123, 123, 124, 124, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125 -}; +#define YYPACT_NINF -221 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-221))) + +#define YYTABLE_NINF -137 + +#define yytable_value_is_error(Yytable_value) \ + 0 + + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +static const yytype_int16 yypact[] = { - 0, 2, 1, 3, 3, 0, 0, 3, 0, 5, - 0, 4, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 6, 2, - 2, 2, 0, 7, 2, 0, 4, 3, 2, 0, - 2, 3, 3, 2, 1, 2, 1, 1, 2, 2, - 2, 0, 6, 4, 3, 2, 0, 1, 2, 2, - 4, 4, 1, 2, 0, 8, 2, 0, 2, 0, - 4, 3, 2, 0, 1, 3, 2, 1, 1, 3, - 2, 4, 2, 1, 2, 1, 1, 2, 3, 2, - 3, 0, 5, 0, 5, 1, 1, 2, 2, 2, - 0, 7, 3, 1, 1, 2, 0, 4, 3, 2, - 0, 1, 3, 1, 1, 1, 7, 7, 10, 10, - 2, 2, 0, 6, 5, 3, 1, 1, 3, 1, - 0, 1, 1, 1, 0, 0, 3, 5, 4, 6, - 3, 5, 2, 0, 1, 2, 3, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, - 2, 1, 3, 1, 1, 0, 1, 1, 1, 1, - 1, 1, 6, 5, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1 + 523, -16, 2, 2, 34, -221, 19, -221, -221, 2, + -221, 24, -15, -221, 115, 43, -221, 40, 39, -221, + -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, + -221, 124, -221, 115, -221, -221, 2, -221, -221, -221, + 221, 65, 601, 669, 701, 733, 60, 61, 488, 3, + 79, 9, 123, 4, -221, -221, -221, 89, -221, -221, + -221, -221, -221, -221, -221, -221, 83, -221, -221, 104, + -221, 6, -10, 115, -221, -221, -221, -221, -221, -221, + -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, + -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, + -221, -221, -221, -221, -221, -1, -221, -221, -221, -221, + -221, -221, -221, 40, 40, -221, 765, -221, 46, -221, + 93, 46, 130, 59, -221, 100, 442, -221, -221, 114, + -221, 99, 66, -221, 101, 10, 221, 221, 102, 103, + 106, -221, 120, 108, 362, 120, 59, -221, -221, -221, + -221, -7, 112, 765, 116, -221, 66, -221, -221, -221, + -221, -221, 120, -221, -221, -221, 117, 118, 54, -221, + 765, 396, 119, 880, 125, -221, 121, 59, 294, 127, + -221, -221, 797, 40, -221, -221, 120, -221, 126, 880, + 131, 362, -221, 35, 128, 221, 134, -221, 829, -221, + 328, -221, 136, 440, 137, -221, -221, -221, 221, 396, + -221, 221, 138, 141, -221, 829, -221, -221, 122, -221, + 29, 66, 139, 133, 362, -221, -221, 144, 440, 143, + 294, -221, 521, 221, 67, 257, -221, 147, -221, -221, + 142, -221, -221, 66, 396, -221, -221, -221, -221, 66, + -221, 328, 221, -221, -221, 148, 564, -221, -221, 69, + -221, -221, -221, 135, -221, 40, 23, 294, 861, -221, + -221, -221, -221, 133, 328, -221, -221, -221, 880, -221, + 185, -221, -221, -221, -221, 184, -221, 829, 184, 40, + 637, -221, -221, -221, 880, -221, 149, 120, -221, -221, + 829, 637, -221, -221 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 0, 0, 6, 165, 2, 10, 161, - 163, 0, 0, 1, 0, 0, 164, 5, 12, 14, + 0, 0, 0, 0, 0, 6, 167, 2, 10, 163, + 165, 0, 0, 1, 0, 0, 166, 5, 12, 14, 19, 20, 21, 22, 15, 16, 17, 18, 23, 24, - 25, 0, 26, 0, 160, 4, 0, 3, 7, 27, + 25, 0, 26, 0, 162, 4, 0, 3, 7, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, - 50, 62, 67, 99, 122, 11, 162, 0, 147, 148, - 149, 150, 151, 152, 153, 154, 155, 157, 0, 144, - 158, 0, 0, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, - 201, 202, 58, 0, 59, 97, 98, 29, 30, 48, - 49, 5, 5, 120, 130, 121, 0, 32, 0, 0, - 69, 0, 100, 0, 0, 156, 145, 0, 159, 0, - 0, 9, 0, 0, 0, 0, 127, 0, 126, 129, - 34, 0, 0, 66, 0, 64, 104, 105, 103, 0, - 130, 0, 146, 0, 170, 171, 169, 166, 167, 168, - 173, 60, 61, 0, 0, 0, 124, 130, 0, 0, - 0, 0, 68, 0, 0, 0, 0, 28, 172, 0, - 5, 131, 128, 132, 125, 0, 0, 0, 0, 44, - 0, 78, 0, 55, 57, 83, 52, 0, 102, 0, - 0, 0, 123, 116, 117, 0, 0, 46, 0, 74, - 38, 47, 77, 33, 54, 0, 43, 0, 0, 80, - 0, 0, 40, 82, 0, 0, 0, 0, 86, 0, - 0, 0, 0, 111, 109, 85, 101, 0, 37, 45, - 0, 0, 76, 41, 42, 79, 0, 53, 0, 0, - 95, 96, 72, 77, 65, 108, 0, 84, 87, 89, - 0, 133, 5, 0, 0, 0, 75, 36, 81, 71, - 84, 0, 88, 90, 93, 0, 91, 134, 107, 118, - 119, 70, 143, 136, 140, 143, 5, 0, 94, 138, - 92, 0, 142, 113, 114, 115, 137, 141, 0, 139, - 112 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 4, 5, 6, 7, 14, 41, 33, 18, 19, - 57, 49, 20, 21, 141, 117, 187, 207, 208, 209, - 210, 50, 22, 23, 118, 171, 193, 51, 52, 24, - 25, 173, 120, 145, 226, 211, 194, 231, 232, 233, - 285, 282, 252, 53, 26, 27, 149, 147, 122, 201, - 234, 292, 293, 28, 29, 54, 30, 123, 137, 138, - 182, 262, 263, 288, 70, 220, 10, 11, 31, 160, - 32, 139 + 50, 62, 67, 99, 123, 11, 164, 0, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 158, 159, 0, + 145, 160, 0, 0, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, + 202, 203, 204, 205, 58, 0, 59, 97, 98, 29, + 30, 48, 49, 5, 5, 121, 131, 122, 0, 32, + 0, 0, 69, 0, 100, 0, 0, 157, 146, 0, + 161, 0, 0, 9, 0, 0, 0, 0, 128, 0, + 127, 130, 34, 0, 0, 66, 0, 64, 104, 105, + 106, 103, 0, 131, 0, 147, 0, 172, 173, 171, + 168, 169, 170, 175, 60, 61, 0, 0, 0, 125, + 131, 0, 0, 0, 0, 68, 0, 0, 0, 0, + 28, 174, 0, 5, 132, 129, 133, 126, 0, 0, + 0, 0, 44, 0, 78, 0, 55, 57, 83, 52, + 0, 102, 0, 0, 0, 124, 117, 118, 0, 0, + 46, 0, 74, 38, 47, 77, 33, 54, 0, 43, + 0, 0, 80, 0, 0, 40, 82, 0, 0, 0, + 0, 86, 0, 0, 0, 0, 112, 110, 85, 101, + 0, 37, 45, 0, 0, 76, 41, 42, 79, 0, + 53, 0, 0, 95, 96, 72, 77, 65, 109, 0, + 84, 87, 89, 0, 134, 5, 0, 0, 0, 75, + 36, 81, 71, 84, 0, 88, 90, 93, 0, 91, + 135, 108, 119, 120, 70, 144, 137, 141, 144, 5, + 0, 94, 139, 92, 0, 143, 114, 115, 116, 138, + 142, 0, 140, 113 }; -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -227 -static const yytype_int16 yypact[] = + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = { - 126, -16, 4, 4, 65, -227, 21, -227, -227, 4, - -227, -10, -11, -227, 73, 38, -227, 46, 58, -227, - -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, - -227, 291, -227, 73, -227, -227, 4, -227, -227, -227, - 853, 61, 559, 625, 656, 687, 59, 63, 479, 6, - 77, 9, 99, 11, -227, -227, -227, 82, -227, -227, - -227, -227, -227, -227, -227, -227, 84, -227, 106, -227, - 5, 26, 73, -227, -227, -227, -227, -227, -227, -227, - -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, - -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, - -227, -227, -227, 29, -227, -227, -227, -227, -227, -227, - -227, 46, 46, -227, 718, -227, 1, -227, 94, 1, - 129, 3, -227, 100, 434, -227, -227, 112, -227, 98, - 158, -227, 101, 37, 853, 853, 105, 103, 110, -227, - 116, 109, 356, 116, 3, -227, -227, -227, -6, 115, - 718, 117, -227, 158, -227, -227, -227, -227, -227, 116, - -227, -227, -227, 104, 119, 86, -227, 718, 389, 120, - 829, 123, -227, 121, 3, 290, 125, -227, -227, 749, - 46, -227, -227, 116, -227, 130, 829, 132, 356, -227, - 69, 113, 853, 131, -227, 780, -227, 323, -227, 136, - 432, 135, -227, -227, -227, 853, 389, -227, 853, 128, - 138, -227, 780, -227, -227, 140, -227, 57, 158, 146, - 151, 356, -227, -227, 152, 432, 153, 290, -227, 219, - 853, 54, 254, -227, 154, -227, -227, 149, -227, -227, - 158, 389, -227, -227, -227, -227, 158, -227, 323, 853, - -227, -227, 160, 523, -227, -227, 60, -227, -227, -227, - 159, -227, 46, 74, 290, 811, -227, -227, -227, -227, - 151, 323, -227, -227, -227, 829, -227, 195, -227, -227, - -227, -227, 194, -227, 780, 194, 46, 594, -227, -227, - -227, 829, -227, 161, 116, -227, -227, 780, 594, -227, - -227 + -221, -221, -221, -17, -12, -221, -221, -221, -221, -221, + -221, -221, -221, -221, -221, -221, -191, -170, -165, -208, + -221, -221, -221, -221, -221, -168, -221, -221, -221, -221, + -221, -221, -221, -221, -220, -29, -221, -30, -221, -25, + -221, -221, -221, -221, -221, -221, -221, -119, -221, -218, + -221, -97, -221, -221, -221, -221, -221, -221, -105, -221, + -221, -72, -221, -79, -104, -27, 11, 207, -221, -145, + -221, -38 }; -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = { - -227, -227, -227, -17, -12, -227, -227, -227, -227, -227, - -227, -227, -227, -227, -227, -227, -191, -162, -159, -182, - -227, -227, -227, -227, -227, -168, -227, -227, -227, -227, - -227, -227, -227, -227, -226, -13, -227, -20, -227, -9, - -227, -227, -227, -227, -227, -227, -227, -119, -227, -215, - -227, -85, -227, -227, -227, -227, -227, -227, -83, -227, - -227, -63, -227, -68, -102, -27, 7, 215, -227, -150, - -227, -38 + -1, 4, 5, 6, 7, 14, 41, 33, 18, 19, + 57, 49, 20, 21, 143, 119, 190, 210, 211, 212, + 213, 50, 22, 23, 120, 174, 196, 51, 52, 24, + 25, 176, 122, 147, 229, 214, 197, 234, 235, 236, + 288, 285, 255, 53, 26, 27, 152, 150, 124, 204, + 237, 295, 296, 28, 29, 54, 30, 125, 139, 140, + 185, 265, 266, 291, 71, 223, 10, 11, 31, 163, + 32, 141 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -136 + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 40, 133, 38, 178, 104, 106, 108, 110, 191, -63, - 115, 192, 255, 71, 140, 238, 34, 143, 116, 148, - 214, 55, 269, 121, 15, 172, 127, 146, 159, 8, - 219, 35, 37, 68, 69, 68, 69, 127, 9, 36, - 36, 230, 148, 56, 174, 281, 239, 16, 17, 278, - 267, 159, -35, 247, -63, 198, -63, -106, 128, 129, - 131, 68, 69, 183, 132, 13, 249, 176, 245, 127, - 230, 39, 148, -13, 1, 130, -5, -5, -5, -5, - -5, -5, -5, -5, 184, 162, 2, 239, 217, 127, - 266, 258, 259, 283, 134, 135, 268, 272, 273, -5, - -5, 68, 69, -8, 215, 244, 72, 163, 164, 296, - 111, 119, 151, 2, 112, 3, 159, 216, 68, 69, - -13, 181, 276, -51, 277, 170, -13, 1, 124, -5, - -5, -5, -5, -5, -5, -5, -5, 125, 159, 126, - 142, 204, 144, 195, 159, 152, 150, 153, 127, 161, - 166, 186, -5, -5, 165, 168, 179, 223, 200, 212, - 167, 175, 218, 205, 177, 188, 2, 197, 3, 180, - 196, 170, 202, 235, 242, 206, 221, 240, 237, 213, - 225, 227, 236, 241, 222, 294, 154, 155, 243, 186, - 68, 69, 156, 157, 158, 246, 294, 248, 253, 264, - 254, 265, 235, 257, 170, 271, 261, 274, 287, 256, - 200, 298, 250, 300, 286, 242, 251, 290, 12, 0, - 0, 0, 270, 0, 186, 0, 0, 280, 0, 0, - 0, 225, 0, 0, 228, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 275, 289, 200, 284, 295, - 189, 68, 69, 0, 225, 260, 0, 0, 190, 299, - 295, 0, 0, 0, 297, 261, 0, 0, 0, 291, - -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, - 0, 0, 0, 0, 0, -134, -134, -134, 0, 0, - 0, 199, 0, -134, -134, 42, 43, 44, 45, 46, - 47, 48, -135, 0, -135, -5, -5, -5, -5, -5, - -5, -5, -5, -5, -5, -5, 0, 0, 0, 0, - -5, -5, -5, -5, 224, 0, 0, 0, 0, -5, - 2, 0, 0, 0, 0, 0, 0, -110, -5, -5, - -5, -5, -5, -5, -5, -5, -5, -5, -5, 0, - 0, 0, 0, -5, -5, -5, -5, 169, 0, 0, + 40, 135, 38, 194, 106, 108, 110, 112, 195, -63, + 117, 181, 258, 72, 142, 118, 123, 145, 241, 151, + 34, 55, 15, 217, 131, 222, 129, 175, 162, 37, + 8, 272, 69, 70, 13, 134, 36, 9, 233, 129, + 132, 242, 151, 129, 177, 16, 17, 56, 179, 281, + -35, -107, 162, 270, 284, -63, 250, -63, 201, 165, + 130, 133, 129, 252, 186, 187, 35, 233, 69, 70, + 286, 218, 279, 151, 280, 36, 248, 39, 247, 69, + 70, 2, 242, 148, 219, -8, 299, 69, 70, 220, + 184, 149, 69, 70, 157, 158, 136, 137, 269, 69, + 70, 159, 160, 161, 271, 261, 262, 275, 276, 166, + 167, 73, 113, 114, 154, -13, 1, 162, -5, -5, + -5, -5, -5, -5, -5, -5, -51, 173, 42, 43, + 44, 45, 46, 47, 48, 121, 126, 127, 128, 162, + 144, -5, -5, 146, 207, 162, 198, 153, 155, 156, + 164, 169, 168, 129, 189, 171, 2, 170, 3, 178, + 226, 203, 215, -13, 180, 191, 208, 225, 200, 183, + 182, 246, 209, 199, 173, 205, 238, 245, 221, 216, + 224, 240, 230, 228, 277, 239, 297, 244, 243, 249, + 251, 257, 189, 267, 274, 268, 264, 297, 290, 253, + 301, 256, 259, 254, 303, 238, 260, 173, 289, 293, + 12, 0, 0, 203, 0, 0, 0, 0, 245, 0, + 0, 0, 0, 0, 0, 273, 0, 189, 0, 0, + 283, 0, 0, 0, 228, 0, 0, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 0, 278, 292, + 203, 287, 298, 68, 69, 70, 0, 228, 263, 0, + 0, 0, 302, 298, 0, 0, 0, 300, 264, 0, + 0, 0, 294, -135, -135, -135, -135, -135, -135, -135, + -135, -135, -135, 0, 0, 0, 0, 0, -135, -135, + -135, -135, 0, 0, 0, 202, 0, -135, -135, 0, + 0, 0, 0, 0, 0, 0, -136, 0, -136, -5, + -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, + 0, 0, 0, 0, -5, -5, -5, -5, -5, 227, + 0, 0, 0, 0, -5, 2, 0, 0, 0, 0, + 0, 0, -111, -5, -5, -5, -5, -5, -5, -5, + -5, -5, -5, -5, 0, 0, 0, 0, -5, -5, + -5, -5, -5, 172, 0, 0, 0, 0, -5, 2, + 0, 0, 0, 0, 0, 0, -73, 0, -5, -5, + -5, -5, -5, -5, -5, -5, -5, -5, 0, 0, + 0, 0, 0, -5, -5, -5, -5, 188, 0, 0, 0, 0, -5, 2, 0, 0, 0, 0, 0, 0, - -73, 0, -5, -5, -5, -5, -5, -5, -5, -5, + -56, 0, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, 0, 0, 0, 0, 0, -5, -5, -5, - 185, 0, 0, 0, 0, -5, 2, 0, 0, 0, - 0, 0, 0, -56, 0, -5, -5, -5, -5, -5, - -5, -5, -5, -5, -5, 0, 0, 0, 0, 0, - -5, -5, -5, 0, 0, 0, 0, 0, -5, 2, - 0, 0, 0, 0, 0, 1, -39, -5, -5, -5, - -5, -5, -5, -5, -5, 0, 0, 228, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 0, 0, - -5, -5, 229, 189, 68, 69, 0, 0, 0, 0, - 0, 190, 0, 0, 2, 0, 3, 0, 0, 0, - 0, -13, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 0, 113, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 114, 73, 74, 75, 76, + -5, 0, 0, 0, 0, 0, -5, 2, 0, 0, + 0, 0, 0, 1, -39, -5, -5, -5, -5, -5, + -5, -5, -5, 0, 0, 231, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 0, 0, -5, -5, + 232, 192, 68, 69, 70, 0, 0, 0, 0, 0, + 193, 0, 0, 2, 0, 3, 0, 0, 0, 0, + -13, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, + 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, + 103, 0, 115, -13, 1, 0, -5, -5, -5, -5, + -5, -5, -5, -5, 0, 116, 231, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 0, 0, -5, + -5, 0, 192, 68, 69, 70, 0, 0, 0, 0, + 0, 193, 0, 0, 2, 0, 3, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 0, 222, 0, 0, 0, - -85, -85, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 0, 102, 0, 0, 0, 103, 73, 74, 75, + 97, 98, 99, 100, 101, 102, 103, 0, 225, 0, + 0, 0, -85, -85, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 0, 104, 0, 0, 0, 105, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 69, 70, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, + 102, 103, 0, 107, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 0, 109, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 0, 111, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 100, 101, 68, 69, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 0, 105, 73, + 96, 97, 98, 99, 100, 101, 102, 103, 0, 138, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 0, 107, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 0, - 109, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 0, 206, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 0, 136, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 0, 203, 73, 74, 75, 76, 77, 78, 79, + 102, 103, 0, 225, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 0, 222, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 99, 100, 101, 0, 279, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 0, 0, 0, 0, 0, - 189, 68, 69, 0, 0, 0, 0, 0, 190, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 0, - 0, 0, 0, 0, 0, 68, 69 + 100, 101, 102, 103, 0, 282, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 0, 0, 0, 0, + 0, 192, 68, 69, 70, 0, 0, 0, 0, 0, + 193 }; static const yytype_int16 yycheck[] = { - 17, 103, 14, 153, 42, 43, 44, 45, 170, 0, - 48, 170, 227, 40, 116, 206, 9, 119, 12, 121, - 188, 33, 248, 12, 3, 144, 32, 24, 130, 45, - 192, 41, 43, 32, 33, 32, 33, 32, 34, 50, - 50, 200, 144, 36, 50, 271, 208, 26, 27, 264, - 241, 153, 46, 221, 45, 174, 47, 46, 53, 33, - 72, 32, 33, 165, 35, 0, 225, 150, 218, 32, - 229, 33, 174, 0, 1, 49, 3, 4, 5, 6, - 7, 8, 9, 10, 167, 48, 40, 249, 190, 32, - 240, 37, 38, 275, 111, 112, 246, 37, 38, 26, - 27, 32, 33, 45, 35, 48, 45, 134, 135, 291, - 51, 12, 124, 40, 51, 42, 218, 48, 32, 33, - 47, 35, 48, 46, 50, 142, 0, 1, 46, 3, - 4, 5, 6, 7, 8, 9, 10, 53, 240, 33, - 46, 179, 13, 170, 246, 33, 46, 49, 32, 48, - 47, 168, 26, 27, 49, 46, 52, 195, 175, 186, - 50, 46, 49, 180, 47, 45, 40, 46, 42, 50, - 47, 188, 47, 200, 212, 45, 45, 49, 205, 47, - 197, 45, 47, 45, 33, 287, 28, 29, 48, 206, - 32, 33, 34, 35, 36, 49, 298, 45, 225, 45, - 47, 52, 229, 230, 221, 45, 11, 48, 14, 229, - 227, 50, 225, 298, 277, 253, 225, 285, 3, -1, - -1, -1, 249, -1, 241, -1, -1, 265, -1, -1, - -1, 248, -1, -1, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 262, 284, 264, 275, 287, - 31, 32, 33, -1, 271, 1, -1, -1, 39, 297, - 298, -1, -1, -1, 291, 11, -1, -1, -1, 286, + 17, 105, 14, 173, 42, 43, 44, 45, 173, 0, + 48, 156, 230, 40, 118, 12, 12, 121, 209, 123, + 9, 33, 3, 191, 34, 195, 33, 146, 132, 44, + 46, 251, 33, 34, 0, 36, 51, 35, 203, 33, + 50, 211, 146, 33, 51, 26, 27, 36, 153, 267, + 47, 47, 156, 244, 274, 46, 224, 48, 177, 49, + 54, 73, 33, 228, 168, 170, 42, 232, 33, 34, + 278, 36, 49, 177, 51, 51, 221, 34, 49, 33, + 34, 41, 252, 24, 49, 46, 294, 33, 34, 193, + 36, 32, 33, 34, 28, 29, 113, 114, 243, 33, + 34, 35, 36, 37, 249, 38, 39, 38, 39, 136, + 137, 46, 52, 52, 126, 0, 1, 221, 3, 4, + 5, 6, 7, 8, 9, 10, 47, 144, 4, 5, + 6, 7, 8, 9, 10, 12, 47, 54, 34, 243, + 47, 26, 27, 13, 182, 249, 173, 47, 34, 50, + 49, 48, 50, 33, 171, 47, 41, 51, 43, 47, + 198, 178, 189, 48, 48, 46, 183, 34, 47, 51, + 53, 49, 46, 48, 191, 48, 203, 215, 50, 48, + 46, 208, 46, 200, 49, 48, 290, 46, 50, 50, + 46, 48, 209, 46, 46, 53, 11, 301, 14, 228, + 51, 228, 232, 228, 301, 232, 233, 224, 280, 288, + 3, -1, -1, 230, -1, -1, -1, -1, 256, -1, + -1, -1, -1, -1, -1, 252, -1, 244, -1, -1, + 268, -1, -1, -1, 251, -1, -1, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, -1, 265, 287, + 267, 278, 290, 32, 33, 34, -1, 274, 1, -1, + -1, -1, 300, 301, -1, -1, -1, 294, 11, -1, + -1, -1, 289, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, -1, -1, -1, -1, -1, 31, 32, + 33, 34, -1, -1, -1, 1, -1, 40, 41, -1, + -1, -1, -1, -1, -1, -1, 49, -1, 51, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - -1, -1, -1, -1, -1, 31, 32, 33, -1, -1, - -1, 1, -1, 39, 40, 4, 5, 6, 7, 8, - 9, 10, 48, -1, 50, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, - 30, 31, 32, 33, 1, -1, -1, -1, -1, 39, - 40, -1, -1, -1, -1, -1, -1, 47, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, - -1, -1, -1, 30, 31, 32, 33, 1, -1, -1, - -1, -1, 39, 40, -1, -1, -1, -1, -1, -1, - 47, -1, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, -1, -1, -1, -1, -1, 31, 32, 33, - 1, -1, -1, -1, -1, 39, 40, -1, -1, -1, - -1, -1, -1, 47, -1, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - 31, 32, 33, -1, -1, -1, -1, -1, 39, 40, - -1, -1, -1, -1, -1, 1, 47, 3, 4, 5, - 6, 7, 8, 9, 10, -1, -1, 15, 16, 17, + -1, -1, -1, -1, 30, 31, 32, 33, 34, 1, + -1, -1, -1, -1, 40, 41, -1, -1, -1, -1, + -1, -1, 48, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, -1, -1, -1, -1, 30, 31, + 32, 33, 34, 1, -1, -1, -1, -1, 40, 41, + -1, -1, -1, -1, -1, -1, 48, -1, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, - 26, 27, 30, 31, 32, 33, -1, -1, -1, -1, - -1, 39, -1, -1, 40, -1, 42, -1, -1, -1, - -1, 47, 3, 4, 5, 6, 7, 8, 9, 10, + -1, -1, -1, 31, 32, 33, 34, 1, -1, -1, + -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, + 48, -1, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, -1, -1, -1, -1, -1, 31, 32, 33, + 34, -1, -1, -1, -1, -1, 40, 41, -1, -1, + -1, -1, -1, 1, 48, 3, 4, 5, 6, 7, + 8, 9, 10, -1, -1, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, -1, -1, 26, 27, + 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, + 40, -1, -1, 41, -1, 43, -1, -1, -1, -1, + 48, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, -1, 34, 0, 1, -1, 3, 4, 5, 6, + 7, 8, 9, 10, -1, 47, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, -1, -1, 26, + 27, -1, 31, 32, 33, 34, -1, -1, -1, -1, + -1, 40, -1, -1, 41, -1, 43, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, -1, 34, -1, + -1, -1, 38, 39, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, -1, 34, -1, -1, -1, 38, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, -1, 33, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 46, 3, 4, 5, 6, + 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, -1, 33, -1, -1, -1, - 37, 38, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, -1, 33, -1, -1, -1, 37, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 3, 4, + 27, 28, 29, 30, 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, -1, 33, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, -1, 33, + 25, 26, 27, 28, 29, 30, 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, -1, - 33, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - -1, 33, 3, 4, 5, 6, 7, 8, 9, 10, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + -1, 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, -1, 33, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, -1, 33, 3, 4, 5, 6, 7, 8, + 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, -1, 33, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - 31, 32, 33, -1, -1, -1, -1, -1, 39, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, - -1, -1, -1, -1, -1, 32, 33 + 29, 30, 31, 32, -1, 34, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, + -1, 31, 32, 33, 34, -1, -1, -1, -1, -1, + 40 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 1, 40, 42, 55, 56, 57, 58, 45, 34, - 120, 121, 121, 0, 59, 3, 26, 27, 62, 63, - 66, 67, 76, 77, 83, 84, 98, 99, 107, 108, - 110, 122, 124, 61, 120, 41, 50, 43, 58, 33, - 57, 60, 4, 5, 6, 7, 8, 9, 10, 65, - 75, 81, 82, 97, 109, 58, 120, 64, 16, 17, + 0, 1, 41, 43, 56, 57, 58, 59, 46, 35, + 121, 122, 122, 0, 60, 3, 26, 27, 63, 64, + 67, 68, 77, 78, 84, 85, 99, 100, 108, 109, + 111, 123, 125, 62, 121, 42, 51, 44, 59, 34, + 58, 61, 4, 5, 6, 7, 8, 9, 10, 66, + 76, 82, 83, 98, 110, 59, 121, 65, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, 33, - 118, 119, 45, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 33, 37, 125, 33, 125, 33, 125, 33, - 125, 51, 51, 33, 46, 125, 12, 69, 78, 12, - 86, 12, 102, 111, 46, 53, 33, 32, 53, 33, - 49, 58, 35, 118, 57, 57, 33, 112, 113, 125, - 118, 68, 46, 118, 13, 87, 24, 101, 118, 100, - 46, 58, 33, 49, 28, 29, 34, 35, 36, 118, - 123, 48, 48, 119, 119, 49, 47, 50, 46, 1, - 57, 79, 101, 85, 50, 46, 112, 47, 123, 52, - 50, 35, 114, 118, 112, 1, 57, 70, 45, 31, - 39, 71, 72, 80, 90, 119, 47, 46, 101, 1, - 57, 103, 47, 33, 125, 57, 45, 71, 72, 73, - 74, 89, 119, 47, 79, 35, 48, 118, 49, 71, - 119, 45, 33, 125, 1, 57, 88, 45, 15, 30, - 72, 91, 92, 93, 104, 119, 47, 119, 70, 71, - 49, 45, 125, 48, 48, 123, 49, 79, 45, 72, - 89, 93, 96, 119, 47, 103, 91, 119, 37, 38, - 1, 11, 115, 116, 45, 52, 123, 70, 123, 88, - 119, 45, 37, 38, 48, 57, 48, 50, 103, 33, - 125, 88, 95, 73, 119, 94, 115, 14, 117, 125, - 117, 57, 105, 106, 118, 125, 73, 119, 50, 125, - 105 + 34, 119, 120, 46, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 34, 38, 126, 34, 126, 34, + 126, 34, 126, 52, 52, 34, 47, 126, 12, 70, + 79, 12, 87, 12, 103, 112, 47, 54, 34, 33, + 54, 34, 50, 59, 36, 119, 58, 58, 34, 113, + 114, 126, 119, 69, 47, 119, 13, 88, 24, 32, + 102, 119, 101, 47, 59, 34, 50, 28, 29, 35, + 36, 37, 119, 124, 49, 49, 120, 120, 50, 48, + 51, 47, 1, 58, 80, 102, 86, 51, 47, 113, + 48, 124, 53, 51, 36, 115, 119, 113, 1, 58, + 71, 46, 31, 40, 72, 73, 81, 91, 120, 48, + 47, 102, 1, 58, 104, 48, 34, 126, 58, 46, + 72, 73, 74, 75, 90, 120, 48, 80, 36, 49, + 119, 50, 72, 120, 46, 34, 126, 1, 58, 89, + 46, 15, 30, 73, 92, 93, 94, 105, 120, 48, + 120, 71, 72, 50, 46, 126, 49, 49, 124, 50, + 80, 46, 73, 90, 94, 97, 120, 48, 104, 92, + 120, 38, 39, 1, 11, 116, 117, 46, 53, 124, + 71, 124, 89, 120, 46, 38, 39, 49, 58, 49, + 51, 104, 34, 126, 89, 96, 74, 120, 95, 116, + 14, 118, 126, 118, 58, 106, 107, 119, 126, 74, + 120, 51, 126, 106 +}; + + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 55, 56, 57, 58, 58, 60, 59, 61, 59, + 62, 59, 59, 59, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 65, 64, 66, + 66, 67, 69, 68, 70, 70, 71, 71, 71, 71, + 72, 73, 73, 73, 73, 74, 74, 75, 76, 76, + 77, 79, 78, 80, 80, 80, 80, 81, 82, 82, + 83, 83, 83, 84, 86, 85, 87, 87, 88, 88, + 89, 89, 89, 89, 90, 90, 90, 90, 91, 91, + 91, 91, 91, 91, 92, 92, 92, 93, 93, 93, + 93, 95, 94, 96, 94, 97, 97, 98, 98, 99, + 101, 100, 102, 102, 102, 102, 103, 103, 104, 104, + 104, 104, 105, 106, 106, 107, 107, 108, 108, 109, + 109, 110, 110, 112, 111, 111, 113, 113, 114, 114, + 114, 114, 115, 115, 116, 116, 117, 117, 117, 117, + 117, 117, 117, 118, 118, 119, 119, 119, 120, 120, + 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, + 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, + 124, 124, 124, 124, 125, 125, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 3, 3, 0, 0, 3, 0, 5, + 0, 4, 2, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 6, 2, + 2, 2, 0, 7, 2, 0, 4, 3, 2, 0, + 2, 3, 3, 2, 1, 2, 1, 1, 2, 2, + 2, 0, 6, 4, 3, 2, 0, 1, 2, 2, + 4, 4, 1, 2, 0, 8, 2, 0, 2, 0, + 4, 3, 2, 0, 1, 3, 2, 1, 1, 3, + 2, 4, 2, 1, 2, 1, 1, 2, 3, 2, + 3, 0, 5, 0, 5, 1, 1, 2, 2, 2, + 0, 7, 3, 1, 1, 1, 2, 0, 4, 3, + 2, 0, 1, 3, 1, 1, 1, 7, 7, 10, + 10, 2, 2, 0, 6, 5, 3, 1, 1, 3, + 1, 0, 1, 1, 1, 0, 0, 3, 5, 4, + 6, 3, 5, 2, 0, 1, 2, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 1, 2, 2, 1, 3, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 6, 5, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 +}; -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab -#define YYFAIL goto yyerrlab #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif + YYERROR; \ + } \ +while (0) +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval) -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -1133,54 +1033,46 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ + static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1188,22 +1080,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep); YYFPRINTF (yyoutput, ")"); @@ -1214,16 +1095,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1234,49 +1107,42 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1290,7 +1156,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1305,7 +1171,6 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - #if YYERROR_VERBOSE @@ -1314,15 +1179,8 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1338,16 +1196,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1377,27 +1227,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1408,197 +1258,178 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) { - int yyn = yypact[yystate]; + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULLPTR; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) + { + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } + } - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } + + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + + if (*yymsg_alloc < yysize) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif { YYUSE (yyvaluep); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - +/*----------. +| yyparse. | +`----------*/ -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ - -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { /* The lookahead symbol. */ int yychar; + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +YY_INITIAL_VALUE (static YYSTYPE yyval_default;) +YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1608,10 +1439,10 @@ YYSTYPE yylval; int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. + 'yyss': related to states. + 'yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1629,7 +1460,7 @@ YYSTYPE yylval; int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1647,9 +1478,8 @@ YYSTYPE yylval; Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1658,14 +1488,6 @@ YYSTYPE yylval; yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -1686,23 +1508,23 @@ YYSTYPE yylval; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1710,22 +1532,22 @@ YYSTYPE yylval; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1734,10 +1556,10 @@ YYSTYPE yylval; yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1757,7 +1579,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1766,7 +1588,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval); } if (yychar <= YYEOF) @@ -1788,8 +1610,8 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } @@ -1806,7 +1628,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1829,7 +1653,7 @@ yyreduce: yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1843,391 +1667,353 @@ yyreduce: switch (yyn) { case 2: - -/* Line 1455 of yacc.c */ -#line 115 "../Slice/Grammar.y" +#line 116 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 1674 "Grammar.tab.c" /* yacc.c:1646 */ break; case 3: - -/* Line 1455 of yacc.c */ -#line 123 "../Slice/Grammar.y" +#line 124 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (3)]); -;} + (yyval) = (yyvsp[-1]); +} +#line 1682 "Grammar.tab.c" /* yacc.c:1646 */ break; case 4: - -/* Line 1455 of yacc.c */ -#line 132 "../Slice/Grammar.y" +#line 133 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (3)]); -;} + (yyval) = (yyvsp[-1]); +} +#line 1690 "Grammar.tab.c" /* yacc.c:1646 */ break; case 5: - -/* Line 1455 of yacc.c */ -#line 136 "../Slice/Grammar.y" +#line 137 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = new StringListTok; -;} +} +#line 1698 "Grammar.tab.c" /* yacc.c:1646 */ break; case 6: - -/* Line 1455 of yacc.c */ -#line 145 "../Slice/Grammar.y" +#line 146 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[0])); if(!metaData->v.empty()) { unit->addGlobalMetaData(metaData->v); } -;} +} +#line 1710 "Grammar.tab.c" /* yacc.c:1646 */ break; case 8: - -/* Line 1455 of yacc.c */ -#line 154 "../Slice/Grammar.y" +#line 155 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (2)])); - ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (2)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1])); + ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[0])); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } -;} +} +#line 1723 "Grammar.tab.c" /* yacc.c:1646 */ break; case 10: - -/* Line 1455 of yacc.c */ -#line 164 "../Slice/Grammar.y" +#line 165 "../Slice/Grammar.y" /* yacc.c:1646 */ { yyerrok; -;} +} +#line 1731 "Grammar.tab.c" /* yacc.c:1646 */ break; case 12: - -/* Line 1455 of yacc.c */ -#line 169 "../Slice/Grammar.y" +#line 170 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("`;' missing after definition"); -;} +} +#line 1739 "Grammar.tab.c" /* yacc.c:1646 */ break; case 13: - -/* Line 1455 of yacc.c */ -#line 173 "../Slice/Grammar.y" +#line 174 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 1746 "Grammar.tab.c" /* yacc.c:1646 */ break; case 14: - -/* Line 1455 of yacc.c */ -#line 181 "../Slice/Grammar.y" +#line 182 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || ModulePtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || ModulePtr::dynamicCast((yyvsp[0]))); +} +#line 1754 "Grammar.tab.c" /* yacc.c:1646 */ break; case 15: - -/* Line 1455 of yacc.c */ -#line 185 "../Slice/Grammar.y" +#line 186 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0]))); +} +#line 1762 "Grammar.tab.c" /* yacc.c:1646 */ break; case 16: - -/* Line 1455 of yacc.c */ -#line 189 "../Slice/Grammar.y" +#line 190 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0]))); +} +#line 1770 "Grammar.tab.c" /* yacc.c:1646 */ break; case 17: - -/* Line 1455 of yacc.c */ -#line 193 "../Slice/Grammar.y" +#line 194 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0]))); +} +#line 1778 "Grammar.tab.c" /* yacc.c:1646 */ break; case 18: - -/* Line 1455 of yacc.c */ -#line 197 "../Slice/Grammar.y" +#line 198 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0]))); +} +#line 1786 "Grammar.tab.c" /* yacc.c:1646 */ break; case 19: - -/* Line 1455 of yacc.c */ -#line 201 "../Slice/Grammar.y" +#line 202 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0); -;} + assert((yyvsp[0]) == 0); +} +#line 1794 "Grammar.tab.c" /* yacc.c:1646 */ break; case 20: - -/* Line 1455 of yacc.c */ -#line 205 "../Slice/Grammar.y" +#line 206 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || ExceptionPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || ExceptionPtr::dynamicCast((yyvsp[0]))); +} +#line 1802 "Grammar.tab.c" /* yacc.c:1646 */ break; case 21: - -/* Line 1455 of yacc.c */ -#line 209 "../Slice/Grammar.y" +#line 210 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0); -;} + assert((yyvsp[0]) == 0); +} +#line 1810 "Grammar.tab.c" /* yacc.c:1646 */ break; case 22: - -/* Line 1455 of yacc.c */ -#line 213 "../Slice/Grammar.y" +#line 214 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || StructPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || StructPtr::dynamicCast((yyvsp[0]))); +} +#line 1818 "Grammar.tab.c" /* yacc.c:1646 */ break; case 23: - -/* Line 1455 of yacc.c */ -#line 217 "../Slice/Grammar.y" +#line 218 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || SequencePtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || SequencePtr::dynamicCast((yyvsp[0]))); +} +#line 1826 "Grammar.tab.c" /* yacc.c:1646 */ break; case 24: - -/* Line 1455 of yacc.c */ -#line 221 "../Slice/Grammar.y" +#line 222 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || DictionaryPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || DictionaryPtr::dynamicCast((yyvsp[0]))); +} +#line 1834 "Grammar.tab.c" /* yacc.c:1646 */ break; case 25: - -/* Line 1455 of yacc.c */ -#line 225 "../Slice/Grammar.y" +#line 226 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || EnumPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || EnumPtr::dynamicCast((yyvsp[0]))); +} +#line 1842 "Grammar.tab.c" /* yacc.c:1646 */ break; case 26: - -/* Line 1455 of yacc.c */ -#line 229 "../Slice/Grammar.y" +#line 230 "../Slice/Grammar.y" /* yacc.c:1646 */ { - assert((yyvsp[(1) - (1)]) == 0 || ConstPtr::dynamicCast((yyvsp[(1) - (1)]))); -;} + assert((yyvsp[0]) == 0 || ConstPtr::dynamicCast((yyvsp[0]))); +} +#line 1850 "Grammar.tab.c" /* yacc.c:1646 */ break; case 27: - -/* Line 1455 of yacc.c */ -#line 238 "../Slice/Grammar.y" +#line 239 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->setSeenDefinition(); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); ModulePtr module = cont->createModule(ident->v); if(module) { - cont->checkIntroduced(ident->v, module); - unit->pushContainer(module); - (yyval) = module; + cont->checkIntroduced(ident->v, module); + unit->pushContainer(module); + (yyval) = module; } else { (yyval) = 0; } -;} +} +#line 1871 "Grammar.tab.c" /* yacc.c:1646 */ break; case 28: - -/* Line 1455 of yacc.c */ -#line 255 "../Slice/Grammar.y" +#line 256 "../Slice/Grammar.y" /* yacc.c:1646 */ { - if((yyvsp[(3) - (6)])) + if((yyvsp[-3])) { - unit->popContainer(); - (yyval) = (yyvsp[(3) - (6)]); + unit->popContainer(); + (yyval) = (yyvsp[-3]); } else { (yyval) = 0; } -;} +} +#line 1887 "Grammar.tab.c" /* yacc.c:1646 */ break; case 29: - -/* Line 1455 of yacc.c */ -#line 272 "../Slice/Grammar.y" +#line 273 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (2)]); -;} + (yyval) = (yyvsp[0]); +} +#line 1895 "Grammar.tab.c" /* yacc.c:1646 */ break; case 30: - -/* Line 1455 of yacc.c */ -#line 276 "../Slice/Grammar.y" +#line 277 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as exception name"); - (yyval) = (yyvsp[(2) - (2)]); // Dummy -;} + (yyval) = (yyvsp[0]); // Dummy +} +#line 1905 "Grammar.tab.c" /* yacc.c:1646 */ break; case 31: - -/* Line 1455 of yacc.c */ -#line 287 "../Slice/Grammar.y" +#line 288 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("exceptions cannot be forward declared"); (yyval) = 0; -;} +} +#line 1914 "Grammar.tab.c" /* yacc.c:1646 */ break; case 32: - -/* Line 1455 of yacc.c */ -#line 297 "../Slice/Grammar.y" +#line 298 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)])); - ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[(3) - (3)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1])); + ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); ExceptionPtr ex = cont->createException(ident->v, base, local->v); if(ex) { - cont->checkIntroduced(ident->v, ex); - unit->pushContainer(ex); + cont->checkIntroduced(ident->v, ex); + unit->pushContainer(ex); } (yyval) = ex; -;} +} +#line 1932 "Grammar.tab.c" /* yacc.c:1646 */ break; case 33: - -/* Line 1455 of yacc.c */ -#line 311 "../Slice/Grammar.y" +#line 312 "../Slice/Grammar.y" /* yacc.c:1646 */ { - if((yyvsp[(4) - (7)])) + if((yyvsp[-3])) { - unit->popContainer(); + unit->popContainer(); } - (yyval) = (yyvsp[(4) - (7)]); -;} + (yyval) = (yyvsp[-3]); +} +#line 1944 "Grammar.tab.c" /* yacc.c:1646 */ break; case 34: - -/* Line 1455 of yacc.c */ -#line 324 "../Slice/Grammar.y" +#line 325 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); ContainedPtr contained = cont->lookupException(scoped->v); cont->checkIntroduced(scoped->v); (yyval) = contained; -;} +} +#line 1956 "Grammar.tab.c" /* yacc.c:1646 */ break; case 35: - -/* Line 1455 of yacc.c */ -#line 332 "../Slice/Grammar.y" +#line 333 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = 0; -;} +} +#line 1964 "Grammar.tab.c" /* yacc.c:1646 */ break; case 36: - -/* Line 1455 of yacc.c */ -#line 341 "../Slice/Grammar.y" +#line 342 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)])); - ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } -;} +} +#line 1977 "Grammar.tab.c" /* yacc.c:1646 */ break; case 37: - -/* Line 1455 of yacc.c */ -#line 350 "../Slice/Grammar.y" +#line 351 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 1984 "Grammar.tab.c" /* yacc.c:1646 */ break; case 38: - -/* Line 1455 of yacc.c */ -#line 353 "../Slice/Grammar.y" +#line 354 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("`;' missing after definition"); -;} +} +#line 1992 "Grammar.tab.c" /* yacc.c:1646 */ break; case 39: - -/* Line 1455 of yacc.c */ -#line 357 "../Slice/Grammar.y" +#line 358 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 1999 "Grammar.tab.c" /* yacc.c:1646 */ break; case 40: - -/* Line 1455 of yacc.c */ -#line 365 "../Slice/Grammar.y" +#line 366 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); TypeStringTokPtr typestring = new TypeStringTok; typestring->v = make_pair(type, ident->v); (yyval) = typestring; -;} +} +#line 2011 "Grammar.tab.c" /* yacc.c:1646 */ break; case 41: - -/* Line 1455 of yacc.c */ -#line 378 "../Slice/Grammar.y" +#line 379 "../Slice/Grammar.y" /* yacc.c:1646 */ { - IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[(2) - (3)])); + IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[-1])); int tag; if(i->v < 0 || i->v > Int32Max) @@ -2244,15 +2030,14 @@ yyreduce: m->v.optional = tag >= 0; m->v.tag = tag; (yyval) = m; -;} +} +#line 2035 "Grammar.tab.c" /* yacc.c:1646 */ break; case 42: - -/* Line 1455 of yacc.c */ -#line 398 "../Slice/Grammar.y" +#line 399 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (3)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); assert(cont); @@ -2305,106 +2090,98 @@ yyreduce: m->v.optional = tag >= 0; m->v.tag = tag; (yyval) = m; -;} +} +#line 2095 "Grammar.tab.c" /* yacc.c:1646 */ break; case 43: - -/* Line 1455 of yacc.c */ -#line 454 "../Slice/Grammar.y" +#line 455 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("missing tag for optional"); OptionalDefTokPtr m = new OptionalDefTok; // Dummy m->v.optional = false; m->v.tag = -1; (yyval) = m; -;} +} +#line 2107 "Grammar.tab.c" /* yacc.c:1646 */ break; case 44: - -/* Line 1455 of yacc.c */ -#line 462 "../Slice/Grammar.y" +#line 463 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("missing tag for optional"); OptionalDefTokPtr m = new OptionalDefTok; // Dummy m->v.optional = false; m->v.tag = -1; (yyval) = m; -;} +} +#line 2119 "Grammar.tab.c" /* yacc.c:1646 */ break; case 45: - -/* Line 1455 of yacc.c */ -#line 475 "../Slice/Grammar.y" +#line 476 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)])); - TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); + TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); m->v.type = ts->v.first; m->v.name = ts->v.second; (yyval) = m; -;} +} +#line 2131 "Grammar.tab.c" /* yacc.c:1646 */ break; case 46: - -/* Line 1455 of yacc.c */ -#line 483 "../Slice/Grammar.y" +#line 484 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); OptionalDefTokPtr m = new OptionalDefTok; m->v.type = ts->v.first; m->v.name = ts->v.second; m->v.optional = false; m->v.tag = -1; (yyval) = m; -;} +} +#line 2145 "Grammar.tab.c" /* yacc.c:1646 */ break; case 48: - -/* Line 1455 of yacc.c */ -#line 504 "../Slice/Grammar.y" +#line 505 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (2)]); -;} + (yyval) = (yyvsp[0]); +} +#line 2153 "Grammar.tab.c" /* yacc.c:1646 */ break; case 49: - -/* Line 1455 of yacc.c */ -#line 508 "../Slice/Grammar.y" +#line 509 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as struct name"); - (yyval) = (yyvsp[(2) - (2)]); // Dummy -;} + (yyval) = (yyvsp[0]); // Dummy +} +#line 2163 "Grammar.tab.c" /* yacc.c:1646 */ break; case 50: - -/* Line 1455 of yacc.c */ -#line 519 "../Slice/Grammar.y" +#line 520 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("structs cannot be forward declared"); (yyval) = 0; // Dummy -;} +} +#line 2172 "Grammar.tab.c" /* yacc.c:1646 */ break; case 51: - -/* Line 1455 of yacc.c */ -#line 529 "../Slice/Grammar.y" +#line 530 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); StructPtr st = cont->createStruct(ident->v, local->v); if(st) { - cont->checkIntroduced(ident->v, st); - unit->pushContainer(st); + cont->checkIntroduced(ident->v, st); + unit->pushContainer(st); } else { @@ -2413,19 +2190,18 @@ yyreduce: unit->pushContainer(st); } (yyval) = st; -;} +} +#line 2195 "Grammar.tab.c" /* yacc.c:1646 */ break; case 52: - -/* Line 1455 of yacc.c */ -#line 548 "../Slice/Grammar.y" +#line 549 "../Slice/Grammar.y" /* yacc.c:1646 */ { - if((yyvsp[(3) - (6)])) + if((yyvsp[-3])) { - unit->popContainer(); + unit->popContainer(); } - (yyval) = (yyvsp[(3) - (6)]); + (yyval) = (yyvsp[-3]); // // Empty structures are not allowed @@ -2434,76 +2210,69 @@ yyreduce: assert(st); if(st->dataMembers().empty()) { - unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy + unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy } -;} +} +#line 2217 "Grammar.tab.c" /* yacc.c:1646 */ break; case 53: - -/* Line 1455 of yacc.c */ -#line 571 "../Slice/Grammar.y" +#line 572 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)])); - ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } -;} +} +#line 2230 "Grammar.tab.c" /* yacc.c:1646 */ break; case 54: - -/* Line 1455 of yacc.c */ -#line 580 "../Slice/Grammar.y" +#line 581 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 2237 "Grammar.tab.c" /* yacc.c:1646 */ break; case 55: - -/* Line 1455 of yacc.c */ -#line 583 "../Slice/Grammar.y" +#line 584 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("`;' missing after definition"); -;} +} +#line 2245 "Grammar.tab.c" /* yacc.c:1646 */ break; case 56: - -/* Line 1455 of yacc.c */ -#line 587 "../Slice/Grammar.y" +#line 588 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 2252 "Grammar.tab.c" /* yacc.c:1646 */ break; case 58: - -/* Line 1455 of yacc.c */ -#line 601 "../Slice/Grammar.y" +#line 602 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (2)]); -;} + (yyval) = (yyvsp[0]); +} +#line 2260 "Grammar.tab.c" /* yacc.c:1646 */ break; case 59: - -/* Line 1455 of yacc.c */ -#line 605 "../Slice/Grammar.y" +#line 606 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as class name"); - (yyval) = (yyvsp[(2) - (2)]); // Dummy -;} + (yyval) = (yyvsp[0]); // Dummy +} +#line 2270 "Grammar.tab.c" /* yacc.c:1646 */ break; case 60: - -/* Line 1455 of yacc.c */ -#line 616 "../Slice/Grammar.y" +#line 617 "../Slice/Grammar.y" /* yacc.c:1646 */ { - IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[(3) - (4)]))->v; + IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[-1]))->v; if(id < 0) { unit->error("invalid compact id for class: id must be a positive integer"); @@ -2522,18 +2291,17 @@ yyreduce: } ClassIdTokPtr classId = new ClassIdTok(); - classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v; + classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v; classId->t = static_cast(id); (yyval) = classId; -;} +} +#line 2299 "Grammar.tab.c" /* yacc.c:1646 */ break; case 61: - -/* Line 1455 of yacc.c */ -#line 641 "../Slice/Grammar.y" +#line 642 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(3) - (4)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); assert(cont); @@ -2591,194 +2359,181 @@ yyreduce: } ClassIdTokPtr classId = new ClassIdTok(); - classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v; + classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v; classId->t = id; (yyval) = classId; -;} +} +#line 2368 "Grammar.tab.c" /* yacc.c:1646 */ break; case 62: - -/* Line 1455 of yacc.c */ -#line 706 "../Slice/Grammar.y" +#line 707 "../Slice/Grammar.y" /* yacc.c:1646 */ { ClassIdTokPtr classId = new ClassIdTok(); - classId->v = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]))->v; + classId->v = StringTokPtr::dynamicCast((yyvsp[0]))->v; classId->t = -1; (yyval) = classId; -;} +} +#line 2379 "Grammar.tab.c" /* yacc.c:1646 */ break; case 63: - -/* Line 1455 of yacc.c */ -#line 718 "../Slice/Grammar.y" +#line 719 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); ClassDeclPtr cl = cont->createClassDecl(ident->v, false, local->v); (yyval) = cl; -;} +} +#line 2391 "Grammar.tab.c" /* yacc.c:1646 */ break; case 64: - -/* Line 1455 of yacc.c */ -#line 731 "../Slice/Grammar.y" +#line 732 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)])); - ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[(2) - (4)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-3])); + ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[-2])); ContainerPtr cont = unit->currentContainer(); - ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[(3) - (4)])); - ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(4) - (4)])); + ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[-1])); + ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0])); if(base) { - bases->v.push_front(base); + bases->v.push_front(base); } ClassDefPtr cl = cont->createClassDef(ident->v, ident->t, false, bases->v, local->v); if(cl) { - cont->checkIntroduced(ident->v, cl); - unit->pushContainer(cl); - (yyval) = cl; + cont->checkIntroduced(ident->v, cl); + unit->pushContainer(cl); + (yyval) = cl; } else { (yyval) = 0; } -;} +} +#line 2418 "Grammar.tab.c" /* yacc.c:1646 */ break; case 65: - -/* Line 1455 of yacc.c */ -#line 754 "../Slice/Grammar.y" +#line 755 "../Slice/Grammar.y" /* yacc.c:1646 */ { - if((yyvsp[(5) - (8)])) + if((yyvsp[-3])) { - unit->popContainer(); - (yyval) = (yyvsp[(5) - (8)]); + unit->popContainer(); + (yyval) = (yyvsp[-3]); } else { (yyval) = 0; } -;} +} +#line 2434 "Grammar.tab.c" /* yacc.c:1646 */ break; case 66: - -/* Line 1455 of yacc.c */ -#line 771 "../Slice/Grammar.y" +#line 772 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); TypeList types = cont->lookupType(scoped->v); (yyval) = 0; if(!types.empty()) { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); - if(!cl || cl->isInterface()) - { - string msg = "`"; - msg += scoped->v; - msg += "' is not a class"; - unit->error(msg); - } - else - { - ClassDefPtr def = cl->definition(); - if(!def) - { - string msg = "`"; - msg += scoped->v; - msg += "' has been declared but not defined"; - unit->error(msg); - } - else - { - cont->checkIntroduced(scoped->v); - (yyval) = def; - } - } + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); + if(!cl || cl->isInterface()) + { + string msg = "`"; + msg += scoped->v; + msg += "' is not a class"; + unit->error(msg); + } + else + { + ClassDefPtr def = cl->definition(); + if(!def) + { + string msg = "`"; + msg += scoped->v; + msg += "' has been declared but not defined"; + unit->error(msg); + } + else + { + cont->checkIntroduced(scoped->v); + (yyval) = def; + } + } } -;} +} +#line 2472 "Grammar.tab.c" /* yacc.c:1646 */ break; case 67: - -/* Line 1455 of yacc.c */ -#line 805 "../Slice/Grammar.y" +#line 806 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = 0; -;} +} +#line 2480 "Grammar.tab.c" /* yacc.c:1646 */ break; case 68: - -/* Line 1455 of yacc.c */ -#line 814 "../Slice/Grammar.y" +#line 815 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (2)]); -;} + (yyval) = (yyvsp[0]); +} +#line 2488 "Grammar.tab.c" /* yacc.c:1646 */ break; case 69: - -/* Line 1455 of yacc.c */ -#line 818 "../Slice/Grammar.y" +#line 819 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = new ClassListTok; -;} +} +#line 2496 "Grammar.tab.c" /* yacc.c:1646 */ break; case 70: - -/* Line 1455 of yacc.c */ -#line 827 "../Slice/Grammar.y" +#line 828 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)])); - ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } -;} +} +#line 2509 "Grammar.tab.c" /* yacc.c:1646 */ break; case 71: - -/* Line 1455 of yacc.c */ -#line 836 "../Slice/Grammar.y" +#line 837 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 2516 "Grammar.tab.c" /* yacc.c:1646 */ break; case 72: - -/* Line 1455 of yacc.c */ -#line 839 "../Slice/Grammar.y" +#line 840 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("`;' missing after definition"); -;} +} +#line 2524 "Grammar.tab.c" /* yacc.c:1646 */ break; case 73: - -/* Line 1455 of yacc.c */ -#line 843 "../Slice/Grammar.y" +#line 844 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 2531 "Grammar.tab.c" /* yacc.c:1646 */ break; case 74: - -/* Line 1455 of yacc.c */ -#line 851 "../Slice/Grammar.y" +#line 852 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (1)])); + OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[0])); ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); DataMemberPtr dm; if(cl) @@ -2797,16 +2552,15 @@ yyreduce: } unit->currentContainer()->checkIntroduced(def->v.name, dm); (yyval) = dm; -;} +} +#line 2557 "Grammar.tab.c" /* yacc.c:1646 */ break; case 75: - -/* Line 1455 of yacc.c */ -#line 873 "../Slice/Grammar.y" +#line 874 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (3)])); - ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)])); + OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[-2])); + ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0])); ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); DataMemberPtr dm; @@ -2829,16 +2583,15 @@ yyreduce: } unit->currentContainer()->checkIntroduced(def->v.name, dm); (yyval) = dm; -;} +} +#line 2588 "Grammar.tab.c" /* yacc.c:1646 */ break; case 76: - -/* Line 1455 of yacc.c */ -#line 900 "../Slice/Grammar.y" +#line 901 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)])); - string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v; + TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); + string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { @@ -2856,15 +2609,14 @@ yyreduce: } assert((yyval)); unit->error("keyword `" + name + "' cannot be used as data member name"); -;} +} +#line 2614 "Grammar.tab.c" /* yacc.c:1646 */ break; case 77: - -/* Line 1455 of yacc.c */ -#line 922 "../Slice/Grammar.y" +#line 923 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)])); + TypePtr type = TypePtr::dynamicCast((yyvsp[0])); ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { @@ -2882,758 +2634,719 @@ yyreduce: } assert((yyval)); unit->error("missing data member name"); -;} +} +#line 2639 "Grammar.tab.c" /* yacc.c:1646 */ break; case 78: - -/* Line 1455 of yacc.c */ -#line 948 "../Slice/Grammar.y" +#line 949 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); assert(st); DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, 0, "", ""); unit->currentContainer()->checkIntroduced(ts->v.second, dm); (yyval) = dm; -;} +} +#line 2652 "Grammar.tab.c" /* yacc.c:1646 */ break; case 79: - -/* Line 1455 of yacc.c */ -#line 957 "../Slice/Grammar.y" +#line 958 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (3)])); - ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)])); + TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2])); + ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); assert(st); DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, value->v.value, value->v.valueAsString, value->v.valueAsLiteral); unit->currentContainer()->checkIntroduced(ts->v.second, dm); (yyval) = dm; -;} +} +#line 2667 "Grammar.tab.c" /* yacc.c:1646 */ break; case 80: - -/* Line 1455 of yacc.c */ -#line 968 "../Slice/Grammar.y" +#line 969 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); assert(st); (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy assert((yyval)); unit->error("optional data members not supported in struct"); -;} +} +#line 2680 "Grammar.tab.c" /* yacc.c:1646 */ break; case 81: - -/* Line 1455 of yacc.c */ -#line 977 "../Slice/Grammar.y" +#line 978 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (4)])); + TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); assert(st); (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy assert((yyval)); unit->error("optional data members not supported in struct"); -;} +} +#line 2693 "Grammar.tab.c" /* yacc.c:1646 */ break; case 82: - -/* Line 1455 of yacc.c */ -#line 986 "../Slice/Grammar.y" +#line 987 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)])); - string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v; + TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); + string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); assert(st); (yyval) = st->createDataMember(name, type, false, 0, 0, "", ""); // Dummy assert((yyval)); unit->error("keyword `" + name + "' cannot be used as data member name"); -;} +} +#line 2707 "Grammar.tab.c" /* yacc.c:1646 */ break; case 83: - -/* Line 1455 of yacc.c */ -#line 996 "../Slice/Grammar.y" +#line 997 "../Slice/Grammar.y" /* yacc.c:1646 */ { - TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)])); + TypePtr type = TypePtr::dynamicCast((yyvsp[0])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); assert(st); (yyval) = st->createDataMember(IceUtil::generateUUID(), type, false, 0, 0, "", ""); // Dummy assert((yyval)); unit->error("missing data member name"); -;} +} +#line 2720 "Grammar.tab.c" /* yacc.c:1646 */ break; case 84: - -/* Line 1455 of yacc.c */ -#line 1010 "../Slice/Grammar.y" +#line 1011 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)])); - m->v.type = TypePtr::dynamicCast((yyvsp[(2) - (2)])); + OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); + m->v.type = TypePtr::dynamicCast((yyvsp[0])); (yyval) = m; -;} +} +#line 2730 "Grammar.tab.c" /* yacc.c:1646 */ break; case 85: - -/* Line 1455 of yacc.c */ -#line 1016 "../Slice/Grammar.y" +#line 1017 "../Slice/Grammar.y" /* yacc.c:1646 */ { OptionalDefTokPtr m = new OptionalDefTok(); - m->v.type = TypePtr::dynamicCast((yyvsp[(1) - (1)])); + m->v.type = TypePtr::dynamicCast((yyvsp[0])); m->v.optional = false; m->v.tag = -1; (yyval) = m; -;} +} +#line 2742 "Grammar.tab.c" /* yacc.c:1646 */ break; case 86: - -/* Line 1455 of yacc.c */ -#line 1024 "../Slice/Grammar.y" +#line 1025 "../Slice/Grammar.y" /* yacc.c:1646 */ { OptionalDefTokPtr m = new OptionalDefTok; m->v.optional = false; m->v.tag = -1; (yyval) = m; -;} +} +#line 2753 "Grammar.tab.c" /* yacc.c:1646 */ break; case 87: - -/* Line 1455 of yacc.c */ -#line 1036 "../Slice/Grammar.y" +#line 1037 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)])); - string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v; + OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); + string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); - if(op) - { - cl->checkIntroduced(name, op); - unit->pushContainer(op); - (yyval) = op; - } - else - { - (yyval) = 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); + if(op) + { + cl->checkIntroduced(name, op); + unit->pushContainer(op); + (yyval) = op; + } + else + { + (yyval) = 0; + } } else { (yyval) = 0; } -;} +} +#line 2781 "Grammar.tab.c" /* yacc.c:1646 */ break; case 88: - -/* Line 1455 of yacc.c */ -#line 1060 "../Slice/Grammar.y" +#line 1061 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)])); - string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v; + OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); + string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, - Operation::Idempotent); - if(op) - { - cl->checkIntroduced(name, op); - unit->pushContainer(op); - (yyval) = op; - } - else - { - (yyval) = 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, + Operation::Idempotent); + if(op) + { + cl->checkIntroduced(name, op); + unit->pushContainer(op); + (yyval) = op; + } + else + { + (yyval) = 0; + } } else { (yyval) = 0; } -;} +} +#line 2810 "Grammar.tab.c" /* yacc.c:1646 */ break; case 89: - -/* Line 1455 of yacc.c */ -#line 1085 "../Slice/Grammar.y" +#line 1086 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)])); - string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v; + OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); + string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); - if(op) - { - unit->pushContainer(op); - unit->error("keyword `" + name + "' cannot be used as operation name"); - (yyval) = op; // Dummy - } - else - { - (yyval) = 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); + if(op) + { + unit->pushContainer(op); + unit->error("keyword `" + name + "' cannot be used as operation name"); + (yyval) = op; // Dummy + } + else + { + (yyval) = 0; + } } else { (yyval) = 0; } -;} +} +#line 2838 "Grammar.tab.c" /* yacc.c:1646 */ break; case 90: - -/* Line 1455 of yacc.c */ -#line 1109 "../Slice/Grammar.y" +#line 1110 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)])); - string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v; + OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); + string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, - Operation::Idempotent); - if(op) - { - unit->pushContainer(op); - unit->error("keyword `" + name + "' cannot be used as operation name"); - (yyval) = op; // Dummy - } - else - { - return 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, + Operation::Idempotent); + if(op) + { + unit->pushContainer(op); + unit->error("keyword `" + name + "' cannot be used as operation name"); + (yyval) = op; // Dummy + } + else + { + return 0; + } } else { - (yyval) = 0; + (yyval) = 0; } -;} +} +#line 2867 "Grammar.tab.c" /* yacc.c:1646 */ break; case 91: - -/* Line 1455 of yacc.c */ -#line 1139 "../Slice/Grammar.y" +#line 1140 "../Slice/Grammar.y" /* yacc.c:1646 */ { - if((yyvsp[(1) - (3)])) + if((yyvsp[-2])) { - unit->popContainer(); - (yyval) = (yyvsp[(1) - (3)]); + unit->popContainer(); + (yyval) = (yyvsp[-2]); } else { (yyval) = 0; } -;} +} +#line 2883 "Grammar.tab.c" /* yacc.c:1646 */ break; case 92: - -/* Line 1455 of yacc.c */ -#line 1151 "../Slice/Grammar.y" +#line 1152 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)])); - ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)])); + OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1])); + ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0])); assert(el); if(op) { op->setExceptionList(el->v); } -;} +} +#line 2897 "Grammar.tab.c" /* yacc.c:1646 */ break; case 93: - -/* Line 1455 of yacc.c */ -#line 1161 "../Slice/Grammar.y" +#line 1162 "../Slice/Grammar.y" /* yacc.c:1646 */ { - if((yyvsp[(1) - (3)])) + if((yyvsp[-2])) { - unit->popContainer(); + unit->popContainer(); } yyerrok; -;} +} +#line 2909 "Grammar.tab.c" /* yacc.c:1646 */ break; case 94: - -/* Line 1455 of yacc.c */ -#line 1169 "../Slice/Grammar.y" +#line 1170 "../Slice/Grammar.y" /* yacc.c:1646 */ { - OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)])); - ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)])); + OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1])); + ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0])); assert(el); if(op) { op->setExceptionList(el->v); // Dummy } -;} +} +#line 2923 "Grammar.tab.c" /* yacc.c:1646 */ break; case 97: - -/* Line 1455 of yacc.c */ -#line 1191 "../Slice/Grammar.y" +#line 1192 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (2)]); -;} + (yyval) = (yyvsp[0]); +} +#line 2931 "Grammar.tab.c" /* yacc.c:1646 */ break; case 98: - -/* Line 1455 of yacc.c */ -#line 1195 "../Slice/Grammar.y" +#line 1196 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as interface name"); - (yyval) = (yyvsp[(2) - (2)]); // Dummy -;} + (yyval) = (yyvsp[0]); // Dummy +} +#line 2941 "Grammar.tab.c" /* yacc.c:1646 */ break; case 99: - -/* Line 1455 of yacc.c */ -#line 1206 "../Slice/Grammar.y" +#line 1207 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); ClassDeclPtr cl = cont->createClassDecl(ident->v, true, local->v); cont->checkIntroduced(ident->v, cl); (yyval) = cl; -;} +} +#line 2954 "Grammar.tab.c" /* yacc.c:1646 */ break; case 100: - -/* Line 1455 of yacc.c */ -#line 1220 "../Slice/Grammar.y" +#line 1221 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); - ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)])); + ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0])); ClassDefPtr cl = cont->createClassDef(ident->v, -1, true, bases->v, local->v); if(cl) { - cont->checkIntroduced(ident->v, cl); - unit->pushContainer(cl); - (yyval) = cl; + cont->checkIntroduced(ident->v, cl); + unit->pushContainer(cl); + (yyval) = cl; } else { (yyval) = 0; } -;} +} +#line 2976 "Grammar.tab.c" /* yacc.c:1646 */ break; case 101: - -/* Line 1455 of yacc.c */ -#line 1238 "../Slice/Grammar.y" +#line 1239 "../Slice/Grammar.y" /* yacc.c:1646 */ { - if((yyvsp[(4) - (7)])) + if((yyvsp[-3])) { - unit->popContainer(); - (yyval) = (yyvsp[(4) - (7)]); + unit->popContainer(); + (yyval) = (yyvsp[-3]); } else { - (yyval) = 0; + (yyval) = 0; } -;} +} +#line 2992 "Grammar.tab.c" /* yacc.c:1646 */ break; case 102: - -/* Line 1455 of yacc.c */ -#line 1255 "../Slice/Grammar.y" +#line 1256 "../Slice/Grammar.y" /* yacc.c:1646 */ { - ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)])); - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)])); + ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[0])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2])); ContainerPtr cont = unit->currentContainer(); TypeList types = cont->lookupType(scoped->v); if(!types.empty()) { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); - if(!cl || !cl->isInterface()) - { - string msg = "`"; - msg += scoped->v; - msg += "' is not an interface"; - unit->error(msg); - } - else - { - ClassDefPtr def = cl->definition(); - if(!def) - { - string msg = "`"; - msg += scoped->v; - msg += "' has been declared but not defined"; - unit->error(msg); - } - else - { - cont->checkIntroduced(scoped->v); - intfs->v.push_front(def); - } - } + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); + if(!cl || !cl->isInterface()) + { + string msg = "`"; + msg += scoped->v; + msg += "' is not an interface"; + unit->error(msg); + } + else + { + ClassDefPtr def = cl->definition(); + if(!def) + { + string msg = "`"; + msg += scoped->v; + msg += "' has been declared but not defined"; + unit->error(msg); + } + else + { + cont->checkIntroduced(scoped->v); + intfs->v.push_front(def); + } + } } (yyval) = intfs; -;} +} +#line 3031 "Grammar.tab.c" /* yacc.c:1646 */ break; case 103: - -/* Line 1455 of yacc.c */ -#line 1290 "../Slice/Grammar.y" +#line 1291 "../Slice/Grammar.y" /* yacc.c:1646 */ { ClassListTokPtr intfs = new ClassListTok; - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); TypeList types = cont->lookupType(scoped->v); if(!types.empty()) { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); - if(!cl || !cl->isInterface()) - { - string msg = "`"; - msg += scoped->v; - msg += "' is not an interface"; - unit->error(msg); // $$ is a dummy - } - else - { - ClassDefPtr def = cl->definition(); - if(!def) - { - string msg = "`"; - msg += scoped->v; - msg += "' has been declared but not defined"; - unit->error(msg); // $$ is a dummy - } - else - { - cont->checkIntroduced(scoped->v); - intfs->v.push_front(def); - } - } + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); + if(!cl || !cl->isInterface()) + { + string msg = "`"; + msg += scoped->v; + msg += "' is not an interface"; + unit->error(msg); // $$ is a dummy + } + else + { + ClassDefPtr def = cl->definition(); + if(!def) + { + string msg = "`"; + msg += scoped->v; + msg += "' has been declared but not defined"; + unit->error(msg); // $$ is a dummy + } + else + { + cont->checkIntroduced(scoped->v); + intfs->v.push_front(def); + } + } } (yyval) = intfs; -;} +} +#line 3070 "Grammar.tab.c" /* yacc.c:1646 */ break; case 104: - -/* Line 1455 of yacc.c */ -#line 1325 "../Slice/Grammar.y" +#line 1326 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("illegal inheritance from type Object"); (yyval) = new ClassListTok; // Dummy -;} +} +#line 3079 "Grammar.tab.c" /* yacc.c:1646 */ break; case 105: - -/* Line 1455 of yacc.c */ -#line 1335 "../Slice/Grammar.y" +#line 1331 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (2)]); -;} + unit->error("illegal inheritance from type Value"); + (yyval) = new ClassListTok; // Dummy +} +#line 3088 "Grammar.tab.c" /* yacc.c:1646 */ break; case 106: - -/* Line 1455 of yacc.c */ -#line 1339 "../Slice/Grammar.y" +#line 1341 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = new ClassListTok; -;} + (yyval) = (yyvsp[0]); +} +#line 3096 "Grammar.tab.c" /* yacc.c:1646 */ break; case 107: +#line 1345 "../Slice/Grammar.y" /* yacc.c:1646 */ + { + (yyval) = new ClassListTok; +} +#line 3104 "Grammar.tab.c" /* yacc.c:1646 */ + break; -/* Line 1455 of yacc.c */ -#line 1348 "../Slice/Grammar.y" + case 108: +#line 1354 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)])); - ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } -;} +} +#line 3117 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 108: - -/* Line 1455 of yacc.c */ -#line 1357 "../Slice/Grammar.y" + case 109: +#line 1363 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 3124 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 109: - -/* Line 1455 of yacc.c */ -#line 1360 "../Slice/Grammar.y" + case 110: +#line 1366 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("`;' missing after definition"); -;} +} +#line 3132 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 110: - -/* Line 1455 of yacc.c */ -#line 1364 "../Slice/Grammar.y" + case 111: +#line 1370 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 3139 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 112: - -/* Line 1455 of yacc.c */ -#line 1378 "../Slice/Grammar.y" + case 113: +#line 1384 "../Slice/Grammar.y" /* yacc.c:1646 */ { - ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (3)])); - ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[(3) - (3)])); + ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[-2])); + ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[0])); exceptionList->v.push_front(exception); (yyval) = exceptionList; -;} +} +#line 3150 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 113: - -/* Line 1455 of yacc.c */ -#line 1385 "../Slice/Grammar.y" + case 114: +#line 1391 "../Slice/Grammar.y" /* yacc.c:1646 */ { - ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (1)])); + ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[0])); ExceptionListTokPtr exceptionList = new ExceptionListTok; exceptionList->v.push_front(exception); (yyval) = exceptionList; -;} +} +#line 3161 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 114: - -/* Line 1455 of yacc.c */ -#line 1397 "../Slice/Grammar.y" + case 115: +#line 1403 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); ExceptionPtr exception = cont->lookupException(scoped->v); if(!exception) { - exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy + exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy } cont->checkIntroduced(scoped->v, exception); (yyval) = exception; -;} +} +#line 3177 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 115: - -/* Line 1455 of yacc.c */ -#line 1409 "../Slice/Grammar.y" + case 116: +#line 1415 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as exception name"); (yyval) = unit->currentContainer()->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy -;} +} +#line 3187 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 116: - -/* Line 1455 of yacc.c */ -#line 1420 "../Slice/Grammar.y" + case 117: +#line 1426 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)])); - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)])); - TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + TypePtr type = TypePtr::dynamicCast((yyvsp[-2])); ContainerPtr cont = unit->currentContainer(); (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v); -;} +} +#line 3200 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 117: - -/* Line 1455 of yacc.c */ -#line 1429 "../Slice/Grammar.y" + case 118: +#line 1435 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)])); - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)])); - TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + TypePtr type = TypePtr::dynamicCast((yyvsp[-2])); ContainerPtr cont = unit->currentContainer(); (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v); // Dummy unit->error("keyword `" + ident->v + "' cannot be used as sequence name"); -;} +} +#line 3214 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 118: - -/* Line 1455 of yacc.c */ -#line 1444 "../Slice/Grammar.y" - { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)])); - StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)])); - TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)])); - StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)])); - TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)])); + case 119: +#line 1450 "../Slice/Grammar.y" /* yacc.c:1646 */ + { + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); + StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6])); + TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5])); + StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2])); ContainerPtr cont = unit->currentContainer(); (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); -;} +} +#line 3229 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 119: - -/* Line 1455 of yacc.c */ -#line 1455 "../Slice/Grammar.y" - { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)])); - StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)])); - TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)])); - StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)])); - TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)])); + case 120: +#line 1461 "../Slice/Grammar.y" /* yacc.c:1646 */ + { + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); + StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6])); + TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5])); + StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2])); ContainerPtr cont = unit->currentContainer(); (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); // Dummy unit->error("keyword `" + ident->v + "' cannot be used as dictionary name"); -;} +} +#line 3245 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 120: - -/* Line 1455 of yacc.c */ -#line 1472 "../Slice/Grammar.y" + case 121: +#line 1478 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(2) - (2)]); -;} + (yyval) = (yyvsp[0]); +} +#line 3253 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 121: - -/* Line 1455 of yacc.c */ -#line 1476 "../Slice/Grammar.y" + case 122: +#line 1482 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as enumeration name"); - (yyval) = (yyvsp[(2) - (2)]); // Dummy -;} + (yyval) = (yyvsp[0]); // Dummy +} +#line 3263 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 122: - -/* Line 1455 of yacc.c */ -#line 1487 "../Slice/Grammar.y" + case 123: +#line 1493 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); EnumPtr en = cont->createEnum(ident->v, local->v); cont->checkIntroduced(ident->v, en); (yyval) = en; -;} +} +#line 3276 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 123: - -/* Line 1455 of yacc.c */ -#line 1496 "../Slice/Grammar.y" + case 124: +#line 1502 "../Slice/Grammar.y" /* yacc.c:1646 */ { - EnumPtr en = EnumPtr::dynamicCast((yyvsp[(3) - (6)])); + EnumPtr en = EnumPtr::dynamicCast((yyvsp[-3])); if(en) { - EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(5) - (6)])); - if(enumerators->v.empty()) - { - unit->error("enum `" + en->name() + "' must have at least one enumerator"); - } - en->setEnumerators(enumerators->v); // Dummy + EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1])); + if(enumerators->v.empty()) + { + unit->error("enum `" + en->name() + "' must have at least one enumerator"); + } + en->setEnumerators(enumerators->v); // Dummy } - (yyval) = (yyvsp[(3) - (6)]); -;} + (yyval) = (yyvsp[-3]); +} +#line 3294 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 124: - -/* Line 1455 of yacc.c */ -#line 1511 "../Slice/Grammar.y" + case 125: +#line 1517 "../Slice/Grammar.y" /* yacc.c:1646 */ { unit->error("missing enumeration name"); - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (5)])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-4])); ContainerPtr cont = unit->currentContainer(); EnumPtr en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); // Dummy - EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(4) - (5)])); + EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1])); en->setEnumerators(enumerators->v); // Dummy (yyval) = en; -;} +} +#line 3308 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 125: - -/* Line 1455 of yacc.c */ -#line 1526 "../Slice/Grammar.y" + case 126: +#line 1532 "../Slice/Grammar.y" /* yacc.c:1646 */ { - EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[(1) - (3)])); - ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v); + EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[-2])); + ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[0]))->v); (yyval) = ens; -;} +} +#line 3318 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 126: - -/* Line 1455 of yacc.c */ -#line 1532 "../Slice/Grammar.y" + case 127: +#line 1538 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 3325 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 127: - -/* Line 1455 of yacc.c */ -#line 1540 "../Slice/Grammar.y" + case 128: +#line 1546 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); EnumeratorListTokPtr ens = new EnumeratorListTok; ContainerPtr cont = unit->currentContainer(); EnumeratorPtr en = cont->createEnumerator(ident->v); if(en) { - ens->v.push_front(en); + ens->v.push_front(en); } (yyval) = ens; -;} +} +#line 3341 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 128: - -/* Line 1455 of yacc.c */ -#line 1552 "../Slice/Grammar.y" + case 129: +#line 1558 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (3)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2])); EnumeratorListTokPtr ens = new EnumeratorListTok; ContainerPtr cont = unit->currentContainer(); - IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(3) - (3)])); + IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0])); if(intVal) { if(intVal->v < 0 || intVal->v > Int32Max) @@ -3650,46 +3363,42 @@ yyreduce: } } (yyval) = ens; -;} +} +#line 3368 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 129: - -/* Line 1455 of yacc.c */ -#line 1575 "../Slice/Grammar.y" + case 130: +#line 1581 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as enumerator"); EnumeratorListTokPtr ens = new EnumeratorListTok; // Dummy (yyval) = ens; -;} +} +#line 3379 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 130: - -/* Line 1455 of yacc.c */ -#line 1582 "../Slice/Grammar.y" + case 131: +#line 1588 "../Slice/Grammar.y" /* yacc.c:1646 */ { EnumeratorListTokPtr ens = new EnumeratorListTok; (yyval) = ens; // Dummy -;} +} +#line 3388 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 131: - -/* Line 1455 of yacc.c */ -#line 1592 "../Slice/Grammar.y" + case 132: +#line 1598 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(1) - (1)]); -;} + (yyval) = (yyvsp[0]); +} +#line 3396 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 132: - -/* Line 1455 of yacc.c */ -#line 1596 "../Slice/Grammar.y" + case 133: +#line 1602 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainedList cl = unit->currentContainer()->lookupContained(scoped->v); IntegerTokPtr tok; if(!cl.empty()) @@ -3720,433 +3429,407 @@ yyreduce: } (yyval) = tok; -;} +} +#line 3434 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 133: - -/* Line 1455 of yacc.c */ -#line 1635 "../Slice/Grammar.y" + case 134: +#line 1641 "../Slice/Grammar.y" /* yacc.c:1646 */ { BoolTokPtr out = new BoolTok; out->v = true; (yyval) = out; -;} +} +#line 3444 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 134: - -/* Line 1455 of yacc.c */ -#line 1641 "../Slice/Grammar.y" + case 135: +#line 1647 "../Slice/Grammar.y" /* yacc.c:1646 */ { BoolTokPtr out = new BoolTok; out->v = false; (yyval) = out; -;} +} +#line 3454 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 135: - -/* Line 1455 of yacc.c */ -#line 1652 "../Slice/Grammar.y" + case 136: +#line 1658 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 3461 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 136: - -/* Line 1455 of yacc.c */ -#line 1655 "../Slice/Grammar.y" + case 137: +#line 1661 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)])); - OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(3) - (3)])); + BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); + OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0])); OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); - unit->currentContainer()->checkIntroduced(tsp->v.name, pd); - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (3)])); + ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); + unit->currentContainer()->checkIntroduced(tsp->v.name, pd); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1])); if(!metaData->v.empty()) { pd->setMetaData(metaData->v); } } -;} +} +#line 3481 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 137: - -/* Line 1455 of yacc.c */ -#line 1671 "../Slice/Grammar.y" + case 138: +#line 1677 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)])); - OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(5) - (5)])); + BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); + OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0])); OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); - unit->currentContainer()->checkIntroduced(tsp->v.name, pd); - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (5)])); + ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); + unit->currentContainer()->checkIntroduced(tsp->v.name, pd); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1])); if(!metaData->v.empty()) { pd->setMetaData(metaData->v); } } -;} - break; - - case 138: - -/* Line 1455 of yacc.c */ -#line 1687 "../Slice/Grammar.y" - { - BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)])); - TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (4)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (4)])); - OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); - if(op) - { - op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy - unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); - } -;} +} +#line 3501 "Grammar.tab.c" /* yacc.c:1646 */ break; case 139: - -/* Line 1455 of yacc.c */ -#line 1699 "../Slice/Grammar.y" +#line 1693 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (6)])); - TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (6)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(6) - (6)])); + BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3])); + TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy - unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); + op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy + unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } -;} +} +#line 3517 "Grammar.tab.c" /* yacc.c:1646 */ break; case 140: - -/* Line 1455 of yacc.c */ -#line 1711 "../Slice/Grammar.y" +#line 1705 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)])); - TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (3)])); + BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3])); + TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy - unit->error("missing parameter name"); + op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy + unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } -;} +} +#line 3533 "Grammar.tab.c" /* yacc.c:1646 */ break; case 141: - -/* Line 1455 of yacc.c */ -#line 1722 "../Slice/Grammar.y" +#line 1717 "../Slice/Grammar.y" /* yacc.c:1646 */ { - BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)])); - TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (5)])); + BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); + TypePtr type = TypePtr::dynamicCast((yyvsp[0])); OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy - unit->error("missing parameter name"); + op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy + unit->error("missing parameter name"); } -;} +} +#line 3548 "Grammar.tab.c" /* yacc.c:1646 */ break; case 142: - -/* Line 1455 of yacc.c */ -#line 1738 "../Slice/Grammar.y" +#line 1728 "../Slice/Grammar.y" /* yacc.c:1646 */ + { + BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); + TypePtr type = TypePtr::dynamicCast((yyvsp[0])); + OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); + if(op) { - (yyval) = (yyvsp[(2) - (2)]); -;} + op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy + unit->error("missing parameter name"); + } +} +#line 3563 "Grammar.tab.c" /* yacc.c:1646 */ break; case 143: - -/* Line 1455 of yacc.c */ -#line 1742 "../Slice/Grammar.y" +#line 1744 "../Slice/Grammar.y" /* yacc.c:1646 */ { - (yyval) = new ExceptionListTok; -;} + (yyval) = (yyvsp[0]); +} +#line 3571 "Grammar.tab.c" /* yacc.c:1646 */ break; case 144: - -/* Line 1455 of yacc.c */ -#line 1751 "../Slice/Grammar.y" +#line 1748 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} + (yyval) = new ExceptionListTok; +} +#line 3579 "Grammar.tab.c" /* yacc.c:1646 */ break; case 145: +#line 1757 "../Slice/Grammar.y" /* yacc.c:1646 */ + { +} +#line 3586 "Grammar.tab.c" /* yacc.c:1646 */ + break; -/* Line 1455 of yacc.c */ -#line 1754 "../Slice/Grammar.y" + case 146: +#line 1760 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ident->v = "::" + ident->v; (yyval) = ident; -;} +} +#line 3596 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 146: - -/* Line 1455 of yacc.c */ -#line 1760 "../Slice/Grammar.y" + case 147: +#line 1766 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(3) - (3)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); scoped->v += "::"; scoped->v += ident->v; (yyval) = scoped; -;} +} +#line 3608 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 147: - -/* Line 1455 of yacc.c */ -#line 1773 "../Slice/Grammar.y" + case 148: +#line 1779 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindByte); -;} +} +#line 3616 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 148: - -/* Line 1455 of yacc.c */ -#line 1777 "../Slice/Grammar.y" + case 149: +#line 1783 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindBool); -;} +} +#line 3624 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 149: - -/* Line 1455 of yacc.c */ -#line 1781 "../Slice/Grammar.y" + case 150: +#line 1787 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindShort); -;} +} +#line 3632 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 150: - -/* Line 1455 of yacc.c */ -#line 1785 "../Slice/Grammar.y" + case 151: +#line 1791 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindInt); -;} +} +#line 3640 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 151: - -/* Line 1455 of yacc.c */ -#line 1789 "../Slice/Grammar.y" + case 152: +#line 1795 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindLong); -;} +} +#line 3648 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 152: - -/* Line 1455 of yacc.c */ -#line 1793 "../Slice/Grammar.y" + case 153: +#line 1799 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindFloat); -;} +} +#line 3656 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 153: - -/* Line 1455 of yacc.c */ -#line 1797 "../Slice/Grammar.y" + case 154: +#line 1803 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindDouble); -;} +} +#line 3664 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 154: - -/* Line 1455 of yacc.c */ -#line 1801 "../Slice/Grammar.y" + case 155: +#line 1807 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindString); -;} +} +#line 3672 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 155: - -/* Line 1455 of yacc.c */ -#line 1805 "../Slice/Grammar.y" + case 156: +#line 1811 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindObject); -;} +} +#line 3680 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 156: - -/* Line 1455 of yacc.c */ -#line 1809 "../Slice/Grammar.y" + case 157: +#line 1815 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindObjectProxy); -;} +} +#line 3688 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 157: - -/* Line 1455 of yacc.c */ -#line 1813 "../Slice/Grammar.y" + case 158: +#line 1819 "../Slice/Grammar.y" /* yacc.c:1646 */ { (yyval) = unit->builtin(Builtin::KindLocalObject); -;} +} +#line 3696 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 158: + case 159: +#line 1823 "../Slice/Grammar.y" /* yacc.c:1646 */ + { + (yyval) = unit->builtin(Builtin::KindValue); +} +#line 3704 "Grammar.tab.c" /* yacc.c:1646 */ + break; -/* Line 1455 of yacc.c */ -#line 1817 "../Slice/Grammar.y" + case 160: +#line 1827 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); if(cont) { - TypeList types = cont->lookupType(scoped->v); - if(types.empty()) - { - YYERROR; // Can't continue, jump to next yyerrok - } - cont->checkIntroduced(scoped->v); - (yyval) = types.front(); + TypeList types = cont->lookupType(scoped->v); + if(types.empty()) + { + YYERROR; // Can't continue, jump to next yyerrok + } + cont->checkIntroduced(scoped->v); + (yyval) = types.front(); } else { (yyval) = 0; } -;} +} +#line 3727 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 159: - -/* Line 1455 of yacc.c */ -#line 1836 "../Slice/Grammar.y" + case 161: +#line 1846 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (2)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); if(cont) { - TypeList types = cont->lookupType(scoped->v); - if(types.empty()) - { - YYERROR; // Can't continue, jump to next yyerrok - } - for(TypeList::iterator p = types.begin(); p != types.end(); ++p) - { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p); - if(!cl) - { - string msg = "`"; - msg += scoped->v; - msg += "' must be class or interface"; - unit->error(msg); - YYERROR; // Can't continue, jump to next yyerrok - } - cont->checkIntroduced(scoped->v); - if(cl->isLocal()) - { - unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy - } - *p = new Proxy(cl); - } - (yyval) = types.front(); + TypeList types = cont->lookupType(scoped->v); + if(types.empty()) + { + YYERROR; // Can't continue, jump to next yyerrok + } + for(TypeList::iterator p = types.begin(); p != types.end(); ++p) + { + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p); + if(!cl) + { + string msg = "`"; + msg += scoped->v; + msg += "' must be class or interface"; + unit->error(msg); + YYERROR; // Can't continue, jump to next yyerrok + } + cont->checkIntroduced(scoped->v); + if(cl->isLocal()) + { + unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy + } + *p = new Proxy(cl); + } + (yyval) = types.front(); } else { (yyval) = 0; } -;} +} +#line 3767 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 160: - -/* Line 1455 of yacc.c */ -#line 1877 "../Slice/Grammar.y" + case 162: +#line 1887 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[(1) - (2)])); - StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[(2) - (2)])); + StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[-1])); + StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[0])); str1->v += str2->v; -;} +} +#line 3777 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 161: - -/* Line 1455 of yacc.c */ -#line 1883 "../Slice/Grammar.y" + case 163: +#line 1893 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 3784 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 162: - -/* Line 1455 of yacc.c */ -#line 1891 "../Slice/Grammar.y" + case 164: +#line 1901 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(3) - (3)])); - StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[(1) - (3)])); + StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0])); + StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[-2])); stringList->v.push_back(str->v); (yyval) = stringList; -;} +} +#line 3795 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 163: - -/* Line 1455 of yacc.c */ -#line 1898 "../Slice/Grammar.y" + case 165: +#line 1908 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0])); StringListTokPtr stringList = new StringListTok; stringList->v.push_back(str->v); (yyval) = stringList; -;} +} +#line 3806 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 164: - -/* Line 1455 of yacc.c */ -#line 1910 "../Slice/Grammar.y" + case 166: +#line 1920 "../Slice/Grammar.y" /* yacc.c:1646 */ { BoolTokPtr local = new BoolTok; local->v = true; (yyval) = local; -;} +} +#line 3816 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 165: - -/* Line 1455 of yacc.c */ -#line 1916 "../Slice/Grammar.y" + case 167: +#line 1926 "../Slice/Grammar.y" /* yacc.c:1646 */ { BoolTokPtr local = new BoolTok; local->v = false; (yyval) = local; -;} +} +#line 3826 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 166: - -/* Line 1455 of yacc.c */ -#line 1927 "../Slice/Grammar.y" + case 168: +#line 1937 "../Slice/Grammar.y" /* yacc.c:1646 */ { BuiltinPtr type = unit->builtin(Builtin::KindLong); - IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)])); + IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0])); ostringstream sstr; sstr << intVal->v; ConstDefTokPtr def = new ConstDefTok; @@ -4155,16 +3838,15 @@ yyreduce: def->v.valueAsString = sstr.str(); def->v.valueAsLiteral = intVal->literal; (yyval) = def; -;} +} +#line 3843 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 167: - -/* Line 1455 of yacc.c */ -#line 1940 "../Slice/Grammar.y" + case 169: +#line 1950 "../Slice/Grammar.y" /* yacc.c:1646 */ { BuiltinPtr type = unit->builtin(Builtin::KindDouble); - FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)])); + FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[0])); ostringstream sstr; sstr << floatVal->v; ConstDefTokPtr def = new ConstDefTok; @@ -4173,15 +3855,14 @@ yyreduce: def->v.valueAsString = sstr.str(); def->v.valueAsLiteral = floatVal->literal; (yyval) = def; -;} +} +#line 3860 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 168: - -/* Line 1455 of yacc.c */ -#line 1953 "../Slice/Grammar.y" + case 170: +#line 1963 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ConstDefTokPtr def = new ConstDefTok; ContainedList cl = unit->currentContainer()->lookupContained(scoped->v); if(cl.empty()) @@ -4193,9 +3874,9 @@ yyreduce: } else { - EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front()); + EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front()); ConstPtr constant = ConstPtr::dynamicCast(cl.front()); - if(enumerator) + if(enumerator) { unit->currentContainer()->checkIntroduced(scoped->v, enumerator); def->v.type = enumerator->type(); @@ -4211,336 +3892,319 @@ yyreduce: def->v.valueAsLiteral = constant->value(); } else - { - string msg = "illegal initializer: `" + scoped->v + "' is a"; - static const string vowels = "aeiou"; - string kindOf = cl.front()->kindOf(); - if(vowels.find_first_of(kindOf[0]) != string::npos) - { - msg += "n"; - } - msg += " " + kindOf; - unit->error(msg); // $$ is dummy - } + { + string msg = "illegal initializer: `" + scoped->v + "' is a"; + static const string vowels = "aeiou"; + string kindOf = cl.front()->kindOf(); + if(vowels.find_first_of(kindOf[0]) != string::npos) + { + msg += "n"; + } + msg += " " + kindOf; + unit->error(msg); // $$ is dummy + } } (yyval) = def; -;} +} +#line 3910 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 169: - -/* Line 1455 of yacc.c */ -#line 1999 "../Slice/Grammar.y" + case 171: +#line 2009 "../Slice/Grammar.y" /* yacc.c:1646 */ { BuiltinPtr type = unit->builtin(Builtin::KindString); - StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0])); ConstDefTokPtr def = new ConstDefTok; def->v.type = type; def->v.value = type; def->v.valueAsString = literal->v; def->v.valueAsLiteral = literal->literal; (yyval) = def; -;} +} +#line 3925 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 170: - -/* Line 1455 of yacc.c */ -#line 2010 "../Slice/Grammar.y" + case 172: +#line 2020 "../Slice/Grammar.y" /* yacc.c:1646 */ { BuiltinPtr type = unit->builtin(Builtin::KindBool); - StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0])); ConstDefTokPtr def = new ConstDefTok; def->v.type = type; def->v.value = type; def->v.valueAsString = "false"; def->v.valueAsLiteral = "false"; (yyval) = def; -;} +} +#line 3940 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 171: - -/* Line 1455 of yacc.c */ -#line 2021 "../Slice/Grammar.y" + case 173: +#line 2031 "../Slice/Grammar.y" /* yacc.c:1646 */ { BuiltinPtr type = unit->builtin(Builtin::KindBool); - StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)])); + StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0])); ConstDefTokPtr def = new ConstDefTok; def->v.type = type; def->v.value = type; def->v.valueAsString = "true"; def->v.valueAsLiteral = "true"; (yyval) = def; -;} +} +#line 3955 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 172: - -/* Line 1455 of yacc.c */ -#line 2037 "../Slice/Grammar.y" + case 174: +#line 2047 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (6)])); - TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (6)])); - StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (6)])); - ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(6) - (6)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-4])); + TypePtr const_type = TypePtr::dynamicCast((yyvsp[-3])); + StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2])); + ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0])); (yyval) = unit->currentContainer()->createConst(ident->v, const_type, metaData->v, value->v.value, value->v.valueAsString, value->v.valueAsLiteral); -;} +} +#line 3968 "Grammar.tab.c" /* yacc.c:1646 */ break; - case 173: - -/* Line 1455 of yacc.c */ -#line 2046 "../Slice/Grammar.y" + case 175: +#line 2056 "../Slice/Grammar.y" /* yacc.c:1646 */ { - StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (5)])); - TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (5)])); - ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(5) - (5)])); + StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); + TypePtr const_type = TypePtr::dynamicCast((yyvsp[-2])); + ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0])); unit->error("missing constant name"); (yyval) = unit->currentContainer()->createConst(IceUtil::generateUUID(), const_type, metaData->v, value->v.value, value->v.valueAsString, value->v.valueAsLiteral, Dummy); // Dummy -;} - break; - - case 174: - -/* Line 1455 of yacc.c */ -#line 2060 "../Slice/Grammar.y" - { -;} - break; - - case 175: - -/* Line 1455 of yacc.c */ -#line 2063 "../Slice/Grammar.y" - { -;} +} +#line 3981 "Grammar.tab.c" /* yacc.c:1646 */ break; case 176: - -/* Line 1455 of yacc.c */ -#line 2066 "../Slice/Grammar.y" +#line 2070 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 3988 "Grammar.tab.c" /* yacc.c:1646 */ break; case 177: - -/* Line 1455 of yacc.c */ -#line 2069 "../Slice/Grammar.y" +#line 2073 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 3995 "Grammar.tab.c" /* yacc.c:1646 */ break; case 178: - -/* Line 1455 of yacc.c */ -#line 2072 "../Slice/Grammar.y" +#line 2076 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4002 "Grammar.tab.c" /* yacc.c:1646 */ break; case 179: - -/* Line 1455 of yacc.c */ -#line 2075 "../Slice/Grammar.y" +#line 2079 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4009 "Grammar.tab.c" /* yacc.c:1646 */ break; case 180: - -/* Line 1455 of yacc.c */ -#line 2078 "../Slice/Grammar.y" +#line 2082 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4016 "Grammar.tab.c" /* yacc.c:1646 */ break; case 181: - -/* Line 1455 of yacc.c */ -#line 2081 "../Slice/Grammar.y" +#line 2085 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4023 "Grammar.tab.c" /* yacc.c:1646 */ break; case 182: - -/* Line 1455 of yacc.c */ -#line 2084 "../Slice/Grammar.y" +#line 2088 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4030 "Grammar.tab.c" /* yacc.c:1646 */ break; case 183: - -/* Line 1455 of yacc.c */ -#line 2087 "../Slice/Grammar.y" +#line 2091 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4037 "Grammar.tab.c" /* yacc.c:1646 */ break; case 184: - -/* Line 1455 of yacc.c */ -#line 2090 "../Slice/Grammar.y" +#line 2094 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4044 "Grammar.tab.c" /* yacc.c:1646 */ break; case 185: - -/* Line 1455 of yacc.c */ -#line 2093 "../Slice/Grammar.y" +#line 2097 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4051 "Grammar.tab.c" /* yacc.c:1646 */ break; case 186: - -/* Line 1455 of yacc.c */ -#line 2096 "../Slice/Grammar.y" +#line 2100 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4058 "Grammar.tab.c" /* yacc.c:1646 */ break; case 187: - -/* Line 1455 of yacc.c */ -#line 2099 "../Slice/Grammar.y" +#line 2103 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4065 "Grammar.tab.c" /* yacc.c:1646 */ break; case 188: - -/* Line 1455 of yacc.c */ -#line 2102 "../Slice/Grammar.y" +#line 2106 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4072 "Grammar.tab.c" /* yacc.c:1646 */ break; case 189: - -/* Line 1455 of yacc.c */ -#line 2105 "../Slice/Grammar.y" +#line 2109 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4079 "Grammar.tab.c" /* yacc.c:1646 */ break; case 190: - -/* Line 1455 of yacc.c */ -#line 2108 "../Slice/Grammar.y" +#line 2112 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4086 "Grammar.tab.c" /* yacc.c:1646 */ break; case 191: - -/* Line 1455 of yacc.c */ -#line 2111 "../Slice/Grammar.y" +#line 2115 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4093 "Grammar.tab.c" /* yacc.c:1646 */ break; case 192: - -/* Line 1455 of yacc.c */ -#line 2114 "../Slice/Grammar.y" +#line 2118 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4100 "Grammar.tab.c" /* yacc.c:1646 */ break; case 193: - -/* Line 1455 of yacc.c */ -#line 2117 "../Slice/Grammar.y" +#line 2121 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4107 "Grammar.tab.c" /* yacc.c:1646 */ break; case 194: - -/* Line 1455 of yacc.c */ -#line 2120 "../Slice/Grammar.y" +#line 2124 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4114 "Grammar.tab.c" /* yacc.c:1646 */ break; case 195: - -/* Line 1455 of yacc.c */ -#line 2123 "../Slice/Grammar.y" +#line 2127 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4121 "Grammar.tab.c" /* yacc.c:1646 */ break; case 196: - -/* Line 1455 of yacc.c */ -#line 2126 "../Slice/Grammar.y" +#line 2130 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4128 "Grammar.tab.c" /* yacc.c:1646 */ break; case 197: - -/* Line 1455 of yacc.c */ -#line 2129 "../Slice/Grammar.y" +#line 2133 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4135 "Grammar.tab.c" /* yacc.c:1646 */ break; case 198: - -/* Line 1455 of yacc.c */ -#line 2132 "../Slice/Grammar.y" +#line 2136 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4142 "Grammar.tab.c" /* yacc.c:1646 */ break; case 199: - -/* Line 1455 of yacc.c */ -#line 2135 "../Slice/Grammar.y" +#line 2139 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4149 "Grammar.tab.c" /* yacc.c:1646 */ break; case 200: - -/* Line 1455 of yacc.c */ -#line 2138 "../Slice/Grammar.y" +#line 2142 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4156 "Grammar.tab.c" /* yacc.c:1646 */ break; case 201: - -/* Line 1455 of yacc.c */ -#line 2141 "../Slice/Grammar.y" +#line 2145 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4163 "Grammar.tab.c" /* yacc.c:1646 */ break; case 202: +#line 2148 "../Slice/Grammar.y" /* yacc.c:1646 */ + { +} +#line 4170 "Grammar.tab.c" /* yacc.c:1646 */ + break; -/* Line 1455 of yacc.c */ -#line 2144 "../Slice/Grammar.y" + case 203: +#line 2151 "../Slice/Grammar.y" /* yacc.c:1646 */ { -;} +} +#line 4177 "Grammar.tab.c" /* yacc.c:1646 */ break; + case 204: +#line 2154 "../Slice/Grammar.y" /* yacc.c:1646 */ + { +} +#line 4184 "Grammar.tab.c" /* yacc.c:1646 */ + break; + case 205: +#line 2157 "../Slice/Grammar.y" /* yacc.c:1646 */ + { +} +#line 4191 "Grammar.tab.c" /* yacc.c:1646 */ + break; -/* Line 1455 of yacc.c */ -#line 4542 "Grammar.tab.c" + +#line 4195 "Grammar.tab.c" /* yacc.c:1646 */ default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -4549,7 +4213,7 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -4564,10 +4228,14 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -4575,37 +4243,36 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } @@ -4614,20 +4281,20 @@ yyerrlab: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -4646,7 +4313,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -4659,35 +4326,37 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -4711,7 +4380,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -4723,16 +4392,21 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -4743,13 +4417,7 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - - -/* Line 1675 of yacc.c */ -#line 2148 "../Slice/Grammar.y" - +#line 2161 "../Slice/Grammar.y" /* yacc.c:1906 */ diff --git a/cpp/src/Slice/Grammar.h b/cpp/src/Slice/Grammar.h index 0ee3d141315..66aa4b73ccd 100644 --- a/cpp/src/Slice/Grammar.h +++ b/cpp/src/Slice/Grammar.h @@ -1,21 +1,19 @@ +/* A Bison parser, made by GNU Bison 3.0.2. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* Bison interface for Yacc-like parsers in C + + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -28,71 +26,80 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED +# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int slice_debug; +#endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - ICE_MODULE = 258, - ICE_CLASS = 259, - ICE_INTERFACE = 260, - ICE_EXCEPTION = 261, - ICE_STRUCT = 262, - ICE_SEQUENCE = 263, - ICE_DICTIONARY = 264, - ICE_ENUM = 265, - ICE_OUT = 266, - ICE_EXTENDS = 267, - ICE_IMPLEMENTS = 268, - ICE_THROWS = 269, - ICE_VOID = 270, - ICE_BYTE = 271, - ICE_BOOL = 272, - ICE_SHORT = 273, - ICE_INT = 274, - ICE_LONG = 275, - ICE_FLOAT = 276, - ICE_DOUBLE = 277, - ICE_STRING = 278, - ICE_OBJECT = 279, - ICE_LOCAL_OBJECT = 280, - ICE_LOCAL = 281, - ICE_CONST = 282, - ICE_FALSE = 283, - ICE_TRUE = 284, - ICE_IDEMPOTENT = 285, - ICE_OPTIONAL = 286, - ICE_SCOPE_DELIMITER = 287, - ICE_IDENTIFIER = 288, - ICE_STRING_LITERAL = 289, - ICE_INTEGER_LITERAL = 290, - ICE_FLOATING_POINT_LITERAL = 291, - ICE_IDENT_OP = 292, - ICE_KEYWORD_OP = 293, - ICE_OPTIONAL_OP = 294, - ICE_METADATA_OPEN = 295, - ICE_METADATA_CLOSE = 296, - ICE_GLOBAL_METADATA_OPEN = 297, - ICE_GLOBAL_METADATA_CLOSE = 298, - BAD_CHAR = 299 - }; + enum yytokentype + { + ICE_MODULE = 258, + ICE_CLASS = 259, + ICE_INTERFACE = 260, + ICE_EXCEPTION = 261, + ICE_STRUCT = 262, + ICE_SEQUENCE = 263, + ICE_DICTIONARY = 264, + ICE_ENUM = 265, + ICE_OUT = 266, + ICE_EXTENDS = 267, + ICE_IMPLEMENTS = 268, + ICE_THROWS = 269, + ICE_VOID = 270, + ICE_BYTE = 271, + ICE_BOOL = 272, + ICE_SHORT = 273, + ICE_INT = 274, + ICE_LONG = 275, + ICE_FLOAT = 276, + ICE_DOUBLE = 277, + ICE_STRING = 278, + ICE_OBJECT = 279, + ICE_LOCAL_OBJECT = 280, + ICE_LOCAL = 281, + ICE_CONST = 282, + ICE_FALSE = 283, + ICE_TRUE = 284, + ICE_IDEMPOTENT = 285, + ICE_OPTIONAL = 286, + ICE_VALUE = 287, + ICE_SCOPE_DELIMITER = 288, + ICE_IDENTIFIER = 289, + ICE_STRING_LITERAL = 290, + ICE_INTEGER_LITERAL = 291, + ICE_FLOATING_POINT_LITERAL = 292, + ICE_IDENT_OP = 293, + ICE_KEYWORD_OP = 294, + ICE_OPTIONAL_OP = 295, + ICE_METADATA_OPEN = 296, + ICE_METADATA_CLOSE = 297, + ICE_GLOBAL_METADATA_OPEN = 298, + ICE_GLOBAL_METADATA_CLOSE = 299, + BAD_CHAR = 300 + }; #endif - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif +int slice_parse (void); +#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED */ diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 0becd8f5af6..aa23910ee42 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -40,11 +40,11 @@ slice_error(const char* s) if (strcmp(s, "parse error") == 0) { - unit->error("syntax error"); + unit->error("syntax error"); } else { - unit->error(s); + unit->error(s); } } @@ -86,6 +86,7 @@ slice_error(const char* s) %token ICE_TRUE %token ICE_IDEMPOTENT %token ICE_OPTIONAL +%token ICE_VALUE // // Other tokens. @@ -156,7 +157,7 @@ definitions ContainedPtr contained = ContainedPtr::dynamicCast($2); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } } ';' definitions @@ -242,9 +243,9 @@ module_def ModulePtr module = cont->createModule(ident->v); if(module) { - cont->checkIntroduced(ident->v, module); - unit->pushContainer(module); - $$ = module; + cont->checkIntroduced(ident->v, module); + unit->pushContainer(module); + $$ = module; } else { @@ -255,8 +256,8 @@ module_def { if($3) { - unit->popContainer(); - $$ = $3; + unit->popContainer(); + $$ = $3; } else { @@ -302,8 +303,8 @@ exception_def ExceptionPtr ex = cont->createException(ident->v, base, local->v); if(ex) { - cont->checkIntroduced(ident->v, ex); - unit->pushContainer(ex); + cont->checkIntroduced(ident->v, ex); + unit->pushContainer(ex); } $$ = ex; } @@ -311,7 +312,7 @@ exception_def { if($4) { - unit->popContainer(); + unit->popContainer(); } $$ = $4; } @@ -343,7 +344,7 @@ exception_exports ContainedPtr contained = ContainedPtr::dynamicCast($2); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } } | error ';' exception_exports @@ -533,8 +534,8 @@ struct_def StructPtr st = cont->createStruct(ident->v, local->v); if(st) { - cont->checkIntroduced(ident->v, st); - unit->pushContainer(st); + cont->checkIntroduced(ident->v, st); + unit->pushContainer(st); } else { @@ -548,7 +549,7 @@ struct_def { if($3) { - unit->popContainer(); + unit->popContainer(); } $$ = $3; @@ -559,7 +560,7 @@ struct_def assert(st); if(st->dataMembers().empty()) { - unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy + unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy } } ; @@ -573,7 +574,7 @@ struct_exports ContainedPtr contained = ContainedPtr::dynamicCast($2); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } } | error ';' struct_exports @@ -736,14 +737,14 @@ class_def ClassListTokPtr bases = ClassListTokPtr::dynamicCast($4); if(base) { - bases->v.push_front(base); + bases->v.push_front(base); } ClassDefPtr cl = cont->createClassDef(ident->v, ident->t, false, bases->v, local->v); if(cl) { - cont->checkIntroduced(ident->v, cl); - unit->pushContainer(cl); - $$ = cl; + cont->checkIntroduced(ident->v, cl); + unit->pushContainer(cl); + $$ = cl; } else { @@ -754,8 +755,8 @@ class_def { if($5) { - unit->popContainer(); - $$ = $5; + unit->popContainer(); + $$ = $5; } else { @@ -775,30 +776,30 @@ class_extends $$ = 0; if(!types.empty()) { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); - if(!cl || cl->isInterface()) - { - string msg = "`"; - msg += scoped->v; - msg += "' is not a class"; - unit->error(msg); - } - else - { - ClassDefPtr def = cl->definition(); - if(!def) - { - string msg = "`"; - msg += scoped->v; - msg += "' has been declared but not defined"; - unit->error(msg); - } - else - { - cont->checkIntroduced(scoped->v); - $$ = def; - } - } + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); + if(!cl || cl->isInterface()) + { + string msg = "`"; + msg += scoped->v; + msg += "' is not a class"; + unit->error(msg); + } + else + { + ClassDefPtr def = cl->definition(); + if(!def) + { + string msg = "`"; + msg += scoped->v; + msg += "' has been declared but not defined"; + unit->error(msg); + } + else + { + cont->checkIntroduced(scoped->v); + $$ = def; + } + } } } | @@ -829,7 +830,7 @@ class_exports ContainedPtr contained = ContainedPtr::dynamicCast($2); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } } | error ';' class_exports @@ -1039,17 +1040,17 @@ operation_preamble ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); - if(op) - { - cl->checkIntroduced(name, op); - unit->pushContainer(op); - $$ = op; - } - else - { - $$ = 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); + if(op) + { + cl->checkIntroduced(name, op); + unit->pushContainer(op); + $$ = op; + } + else + { + $$ = 0; + } } else { @@ -1063,18 +1064,18 @@ operation_preamble ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, - Operation::Idempotent); - if(op) - { - cl->checkIntroduced(name, op); - unit->pushContainer(op); - $$ = op; - } - else - { - $$ = 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, + Operation::Idempotent); + if(op) + { + cl->checkIntroduced(name, op); + unit->pushContainer(op); + $$ = op; + } + else + { + $$ = 0; + } } else { @@ -1088,17 +1089,17 @@ operation_preamble ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); - if(op) - { - unit->pushContainer(op); - unit->error("keyword `" + name + "' cannot be used as operation name"); - $$ = op; // Dummy - } - else - { - $$ = 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag); + if(op) + { + unit->pushContainer(op); + unit->error("keyword `" + name + "' cannot be used as operation name"); + $$ = op; // Dummy + } + else + { + $$ = 0; + } } else { @@ -1112,22 +1113,22 @@ operation_preamble ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); if(cl) { - OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, - Operation::Idempotent); - if(op) - { - unit->pushContainer(op); - unit->error("keyword `" + name + "' cannot be used as operation name"); - $$ = op; // Dummy - } - else - { - return 0; - } + OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag, + Operation::Idempotent); + if(op) + { + unit->pushContainer(op); + unit->error("keyword `" + name + "' cannot be used as operation name"); + $$ = op; // Dummy + } + else + { + return 0; + } } else { - $$ = 0; + $$ = 0; } } ; @@ -1139,8 +1140,8 @@ operation { if($1) { - unit->popContainer(); - $$ = $1; + unit->popContainer(); + $$ = $1; } else { @@ -1161,7 +1162,7 @@ throws { if($1) { - unit->popContainer(); + unit->popContainer(); } yyerrok; } @@ -1225,9 +1226,9 @@ interface_def ClassDefPtr cl = cont->createClassDef(ident->v, -1, true, bases->v, local->v); if(cl) { - cont->checkIntroduced(ident->v, cl); - unit->pushContainer(cl); - $$ = cl; + cont->checkIntroduced(ident->v, cl); + unit->pushContainer(cl); + $$ = cl; } else { @@ -1238,12 +1239,12 @@ interface_def { if($4) { - unit->popContainer(); - $$ = $4; + unit->popContainer(); + $$ = $4; } else { - $$ = 0; + $$ = 0; } } ; @@ -1259,30 +1260,30 @@ interface_list TypeList types = cont->lookupType(scoped->v); if(!types.empty()) { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); - if(!cl || !cl->isInterface()) - { - string msg = "`"; - msg += scoped->v; - msg += "' is not an interface"; - unit->error(msg); - } - else - { - ClassDefPtr def = cl->definition(); - if(!def) - { - string msg = "`"; - msg += scoped->v; - msg += "' has been declared but not defined"; - unit->error(msg); - } - else - { - cont->checkIntroduced(scoped->v); - intfs->v.push_front(def); - } - } + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); + if(!cl || !cl->isInterface()) + { + string msg = "`"; + msg += scoped->v; + msg += "' is not an interface"; + unit->error(msg); + } + else + { + ClassDefPtr def = cl->definition(); + if(!def) + { + string msg = "`"; + msg += scoped->v; + msg += "' has been declared but not defined"; + unit->error(msg); + } + else + { + cont->checkIntroduced(scoped->v); + intfs->v.push_front(def); + } + } } $$ = intfs; } @@ -1294,30 +1295,30 @@ interface_list TypeList types = cont->lookupType(scoped->v); if(!types.empty()) { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); - if(!cl || !cl->isInterface()) - { - string msg = "`"; - msg += scoped->v; - msg += "' is not an interface"; - unit->error(msg); // $$ is a dummy - } - else - { - ClassDefPtr def = cl->definition(); - if(!def) - { - string msg = "`"; - msg += scoped->v; - msg += "' has been declared but not defined"; - unit->error(msg); // $$ is a dummy - } - else - { - cont->checkIntroduced(scoped->v); - intfs->v.push_front(def); - } - } + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front()); + if(!cl || !cl->isInterface()) + { + string msg = "`"; + msg += scoped->v; + msg += "' is not an interface"; + unit->error(msg); // $$ is a dummy + } + else + { + ClassDefPtr def = cl->definition(); + if(!def) + { + string msg = "`"; + msg += scoped->v; + msg += "' has been declared but not defined"; + unit->error(msg); // $$ is a dummy + } + else + { + cont->checkIntroduced(scoped->v); + intfs->v.push_front(def); + } + } } $$ = intfs; } @@ -1326,6 +1327,11 @@ interface_list unit->error("illegal inheritance from type Object"); $$ = new ClassListTok; // Dummy } +| ICE_VALUE +{ + unit->error("illegal inheritance from type Value"); + $$ = new ClassListTok; // Dummy +} ; // ---------------------------------------------------------------------- @@ -1350,7 +1356,7 @@ interface_exports ContainedPtr contained = ContainedPtr::dynamicCast($2); if(contained && !metaData->v.empty()) { - contained->setMetaData(metaData->v); + contained->setMetaData(metaData->v); } } | error ';' interface_exports @@ -1400,7 +1406,7 @@ exception ExceptionPtr exception = cont->lookupException(scoped->v); if(!exception) { - exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy + exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy } cont->checkIntroduced(scoped->v, exception); $$ = exception; @@ -1497,12 +1503,12 @@ enum_def EnumPtr en = EnumPtr::dynamicCast($3); if(en) { - EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5); - if(enumerators->v.empty()) - { - unit->error("enum `" + en->name() + "' must have at least one enumerator"); - } - en->setEnumerators(enumerators->v); // Dummy + EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5); + if(enumerators->v.empty()) + { + unit->error("enum `" + en->name() + "' must have at least one enumerator"); + } + en->setEnumerators(enumerators->v); // Dummy } $$ = $3; } @@ -1544,7 +1550,7 @@ enumerator EnumeratorPtr en = cont->createEnumerator(ident->v); if(en) { - ens->v.push_front(en); + ens->v.push_front(en); } $$ = ens; } @@ -1658,8 +1664,8 @@ parameters OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); - unit->currentContainer()->checkIntroduced(tsp->v.name, pd); + ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); + unit->currentContainer()->checkIntroduced(tsp->v.name, pd); StringListTokPtr metaData = StringListTokPtr::dynamicCast($2); if(!metaData->v.empty()) { @@ -1674,8 +1680,8 @@ parameters OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); - unit->currentContainer()->checkIntroduced(tsp->v.name, pd); + ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag); + unit->currentContainer()->checkIntroduced(tsp->v.name, pd); StringListTokPtr metaData = StringListTokPtr::dynamicCast($4); if(!metaData->v.empty()) { @@ -1691,8 +1697,8 @@ parameters OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy - unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); + op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy + unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } } | parameters ',' out_qualifier meta_data type keyword @@ -1703,8 +1709,8 @@ parameters OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy - unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); + op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy + unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } } | out_qualifier meta_data type @@ -1714,8 +1720,8 @@ parameters OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy - unit->error("missing parameter name"); + op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy + unit->error("missing parameter name"); } } | parameters ',' out_qualifier meta_data type @@ -1725,8 +1731,8 @@ parameters OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer()); if(op) { - op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy - unit->error("missing parameter name"); + op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy + unit->error("missing parameter name"); } } ; @@ -1813,19 +1819,23 @@ type { $$ = unit->builtin(Builtin::KindLocalObject); } +| ICE_VALUE +{ + $$ = unit->builtin(Builtin::KindValue); +} | scoped_name { StringTokPtr scoped = StringTokPtr::dynamicCast($1); ContainerPtr cont = unit->currentContainer(); if(cont) { - TypeList types = cont->lookupType(scoped->v); - if(types.empty()) - { - YYERROR; // Can't continue, jump to next yyerrok - } - cont->checkIntroduced(scoped->v); - $$ = types.front(); + TypeList types = cont->lookupType(scoped->v); + if(types.empty()) + { + YYERROR; // Can't continue, jump to next yyerrok + } + cont->checkIntroduced(scoped->v); + $$ = types.front(); } else { @@ -1838,30 +1848,30 @@ type ContainerPtr cont = unit->currentContainer(); if(cont) { - TypeList types = cont->lookupType(scoped->v); - if(types.empty()) - { - YYERROR; // Can't continue, jump to next yyerrok - } - for(TypeList::iterator p = types.begin(); p != types.end(); ++p) - { - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p); - if(!cl) - { - string msg = "`"; - msg += scoped->v; - msg += "' must be class or interface"; - unit->error(msg); - YYERROR; // Can't continue, jump to next yyerrok - } - cont->checkIntroduced(scoped->v); - if(cl->isLocal()) - { - unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy - } - *p = new Proxy(cl); - } - $$ = types.front(); + TypeList types = cont->lookupType(scoped->v); + if(types.empty()) + { + YYERROR; // Can't continue, jump to next yyerrok + } + for(TypeList::iterator p = types.begin(); p != types.end(); ++p) + { + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p); + if(!cl) + { + string msg = "`"; + msg += scoped->v; + msg += "' must be class or interface"; + unit->error(msg); + YYERROR; // Can't continue, jump to next yyerrok + } + cont->checkIntroduced(scoped->v); + if(cl->isLocal()) + { + unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy + } + *p = new Proxy(cl); + } + $$ = types.front(); } else { @@ -1963,9 +1973,9 @@ const_initializer } else { - EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front()); + EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front()); ConstPtr constant = ConstPtr::dynamicCast(cl.front()); - if(enumerator) + if(enumerator) { unit->currentContainer()->checkIntroduced(scoped->v, enumerator); def->v.type = enumerator->type(); @@ -1981,17 +1991,17 @@ const_initializer def->v.valueAsLiteral = constant->value(); } else - { - string msg = "illegal initializer: `" + scoped->v + "' is a"; - static const string vowels = "aeiou"; - string kindOf = cl.front()->kindOf(); - if(vowels.find_first_of(kindOf[0]) != string::npos) - { - msg += "n"; - } - msg += " " + kindOf; - unit->error(msg); // $$ is dummy - } + { + string msg = "illegal initializer: `" + scoped->v + "' is a"; + static const string vowels = "aeiou"; + string kindOf = cl.front()->kindOf(); + if(vowels.find_first_of(kindOf[0]) != string::npos) + { + msg += "n"; + } + msg += " " + kindOf; + unit->error(msg); // $$ is dummy + } } $$ = def; } @@ -2143,6 +2153,9 @@ keyword | ICE_OPTIONAL { } +| ICE_VALUE +{ +} ; %% diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 3e27a14e5ee..ff3953444bc 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -650,6 +650,10 @@ Slice::JavaGenerator::getOptionalFormat(const TypePtr& type) assert(false); break; } + case Builtin::KindValue: + { + return "Ice.OptionalFormat.Class"; + } } } @@ -765,6 +769,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type, case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { break; } @@ -1157,6 +1162,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, break; } case Builtin::KindObject: + case Builtin::KindValue: { if(marshal) { @@ -1670,6 +1676,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, } return; } + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: @@ -2153,6 +2160,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out, case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { assert(false); break; @@ -2428,6 +2436,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out, } break; } + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: @@ -2678,6 +2687,7 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out, } break; } + case Builtin::KindValue: case Builtin::KindObject: { if(marshal) @@ -3343,6 +3353,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out, case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { assert(false); break; @@ -3618,6 +3629,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out, case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { assert(false); break; diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/Slice/ObjCUtil.cpp index 77a2d627ece..2f2f39c1c61 100644 --- a/cpp/src/Slice/ObjCUtil.cpp +++ b/cpp/src/Slice/ObjCUtil.cpp @@ -633,6 +633,7 @@ Slice::ObjCGenerator::getOptionalFormat(const TypePtr& type) return "ICEOptionalFormatVSize"; } case Builtin::KindObject: + case Builtin::KindValue: { return "ICEOptionalFormatClass"; } diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 07df9c2f75e..c40ac42c544 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -258,6 +258,11 @@ Slice::Builtin::typeId() const return "::Ice::LocalObject"; break; } + case KindValue: + { + return "::Ice::Value"; + break; + } } assert(false); return ""; // Keep the compiler happy. @@ -266,7 +271,7 @@ Slice::Builtin::typeId() const bool Slice::Builtin::usesClasses() const { - return _kind == KindObject; + return _kind == KindObject || _kind == KindValue; } size_t @@ -283,7 +288,8 @@ Slice::Builtin::minWireSize() const 8, // KindDouble 1, // KindString: at least one byte for an empty string. 1, // KindObject: at least one byte (to marshal an index instead of an instance). - 2 // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes. + 2, // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes. + 1 // KindValue: at least one byte (to marshal an index instead of an instance). }; assert(_kind != KindLocalObject); @@ -293,7 +299,7 @@ Slice::Builtin::minWireSize() const bool Slice::Builtin::isVariableLength() const { - return _kind == KindString || _kind == KindObject || _kind == KindObjectProxy; + return _kind == KindString || _kind == KindObject || _kind == KindObjectProxy || _kind == KindValue; } Builtin::Kind @@ -320,7 +326,8 @@ const char* Slice::Builtin::builtinTable[] = "string", "Object", "Object*", - "LocalObject" + "LocalObject", + "Value" }; Slice::Builtin::Builtin(const UnitPtr& unit, Kind kind) : @@ -408,7 +415,7 @@ Slice::Contained::updateIncludeLevel() bool Slice::Contained::hasMetaData(const string& meta) const -{ +{ return find(_metaData.begin(), _metaData.end(), meta) != _metaData.end(); } @@ -876,17 +883,6 @@ Slice::Container::createSequence(const string& name, const TypePtr& type, const { checkIdentifier(name); - if(_unit->profile() == IceE && !local) - { - BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); - if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type)) - { - string msg = "Sequence `" + name + "' cannot contain object values."; - _unit->error(msg); - return 0; - } - } - ContainedList matches = _unit->findContents(thisScope() + name); if(!matches.empty()) { @@ -942,17 +938,6 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c { checkIdentifier(name); - if(_unit->profile() == IceE && !local) - { - BuiltinPtr builtin = BuiltinPtr::dynamicCast(valueType); - if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(valueType)) - { - string msg = "Dictionary `" + name + "' cannot contain object values."; - _unit->error(msg); - return 0; - } - } - ContainedList matches = _unit->findContents(thisScope() + name); if(!matches.empty()) { @@ -1761,6 +1746,66 @@ Slice::Container::hasClassDefs() const return false; } +bool +Slice::Container::hasLocalClassDefs() const +{ + for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p) + { + ClassDefPtr cl = ClassDefPtr::dynamicCast(*p); + if(cl && cl->isLocal()) + { + return true; + } + + ContainerPtr container = ContainerPtr::dynamicCast(*p); + if(container && container->hasLocalClassDefs()) + { + return true; + } + } + return false; +} + +bool +Slice::Container::hasNonLocalInterfaceDefs() const +{ + for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p) + { + ClassDefPtr cl = ClassDefPtr::dynamicCast(*p); + if(cl && !cl->isLocal() && (cl->isInterface() || !cl->allOperations().empty())) + { + return true; + } + + ContainerPtr container = ContainerPtr::dynamicCast(*p); + if(container && container->hasNonLocalInterfaceDefs()) + { + return true; + } + } + return false; +} + +bool +Slice::Container::hasValueDefs() const +{ + for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p) + { + ClassDefPtr cl = ClassDefPtr::dynamicCast(*p); + if(cl && !cl->isLocal() && !cl->isInterface()) + { + return true; + } + + ContainerPtr container = ContainerPtr::dynamicCast(*p); + if(container && container->hasValueDefs()) + { + return true; + } + } + return false; +} + bool Slice::Container::hasOnlyClassDecls() const { @@ -2562,6 +2607,7 @@ Slice::Container::validateConstant(const string& name, const TypePtr& type, cons case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { assert(false); break; @@ -3186,28 +3232,6 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool { checkIdentifier(name); - if(_unit->profile() == IceE) - { - if(!isLocal()) - { - BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); - if((builtin && builtin->kind() == Builtin::KindObject)) - { - string msg = "Class data member `" + name + "' cannot be a value object."; - _unit->error(msg); - return 0; - } - - ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type); - if(classDecl != 0 && !classDecl->isLocal()) - { - string msg = "Class data member `" + name + "' cannot be a value object."; - _unit->error(msg); - return 0; - } - } - } - assert(!isInterface()); ContainedList matches = _unit->findContents(thisScope() + name); if(!matches.empty()) @@ -3443,7 +3467,9 @@ Slice::ClassDef::classDataMembers() const if(q) { BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type()); - if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type())) + if((builtin && builtin->kind() == Builtin::KindObject) || + (builtin && builtin->kind() == Builtin::KindValue) || + ClassDeclPtr::dynamicCast(q->type())) { result.push_back(q); } @@ -3726,28 +3752,6 @@ Slice::Exception::createDataMember(const string& name, const TypePtr& type, bool { checkIdentifier(name); - if(_unit->profile() == IceE) - { - if(!isLocal()) - { - BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); - if((builtin && builtin->kind() == Builtin::KindObject)) - { - string msg = "Exception data member `" + name + "' cannot be a value object."; - _unit->error(msg); - return 0; - } - - ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type); - if(classDecl != 0 && !classDecl->isLocal()) - { - string msg = "Exception data member `" + name + "' cannot be a value object."; - _unit->error(msg); - return 0; - } - } - } - ContainedList matches = _unit->findContents(thisScope() + name); if(!matches.empty()) { @@ -3912,7 +3916,9 @@ Slice::Exception::classDataMembers() const if(q) { BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type()); - if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type())) + if((builtin && builtin->kind() == Builtin::KindObject) || + (builtin && builtin->kind() == Builtin::KindValue) || + ClassDeclPtr::dynamicCast(q->type())) { result.push_back(q); } @@ -4082,27 +4088,6 @@ Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool op { checkIdentifier(name); - if(_unit->profile() == IceE) - { - if(!isLocal()) - { - BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); - if((builtin && builtin->kind() == Builtin::KindObject)) - { - string msg = "Struct data member `" + name + "' cannot be a value object."; - _unit->error(msg); - return 0; - } - ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type); - if(classDecl != 0 && !classDecl->isLocal()) - { - string msg = "Struct data member `" + name + "' cannot be a value object."; - _unit->error(msg); - return 0; - } - } - } - ContainedList matches = _unit->findContents(thisScope() + name); if(!matches.empty()) { @@ -4217,7 +4202,9 @@ Slice::Struct::classDataMembers() const if(q) { BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type()); - if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type())) + if((builtin && builtin->kind() == Builtin::KindObject) || + (builtin && builtin->kind() == Builtin::KindValue) || + ClassDeclPtr::dynamicCast(q->type())) { result.push_back(q); } @@ -4556,6 +4543,7 @@ Slice::Dictionary::legalKeyType(const TypePtr& type, bool& containsSequence) case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { return false; break; @@ -4933,29 +4921,6 @@ Slice::Operation::createParamDecl(const string& name, const TypePtr& type, bool { checkIdentifier(name); - if(_unit->profile() == IceE) - { - ClassDefPtr cl = ClassDefPtr::dynamicCast(this->container()); - assert(cl); - if(!cl->isLocal()) - { - BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); - if((builtin && builtin->kind() == Builtin::KindObject)) - { - string msg = "Object `" + name + "' cannot be passed by value."; - _unit->error(msg); - return 0; - } - ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type); - if(classDecl != 0 && !classDecl->isLocal()) - { - string msg = "Object `" + name + "' cannot be passed by value."; - _unit->error(msg); - return 0; - } - } - } - ContainedList matches = _unit->findContents(thisScope() + name); if(!matches.empty()) { @@ -5343,26 +5308,6 @@ Slice::Operation::Operation(const ContainerPtr& container, _returnTag(returnTag), _mode(mode) { - if(_unit->profile() == IceE) - { - ClassDefPtr cl = ClassDefPtr::dynamicCast(this->container()); - assert(cl); - if(!cl->isLocal()) - { - BuiltinPtr builtin = BuiltinPtr::dynamicCast(returnType); - if((builtin && builtin->kind() == Builtin::KindObject)) - { - string msg = "Method `" + name + "' cannot return an object by value."; - _unit->error(msg); - } - ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(returnType); - if(classDecl != 0 && !classDecl->isLocal()) - { - string msg = "Method `" + name + "' cannot return an object by value."; - _unit->error(msg); - } - } - } } // ---------------------------------------------------------------------- @@ -6025,6 +5970,11 @@ Slice::Unit::usesNonLocals() const return true; } + if(_builtins.find(Builtin::KindValue) != _builtins.end()) + { + return true; + } + return false; } diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index adeffc18a40..14d5428e20e 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -1643,6 +1643,7 @@ Slice::Python::CodeVisitor::writeType(const TypePtr& p) break; } case Builtin::KindObject: + case Builtin::KindValue: { _out << "IcePy._t_Object"; break; @@ -1706,6 +1707,7 @@ Slice::Python::CodeVisitor::writeInitializer(const DataMemberPtr& m) _out << "''"; break; } + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: @@ -1943,6 +1945,7 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax _out << "\""; // Closing " break; } + case Slice::Builtin::KindValue: case Slice::Builtin::KindObject: case Slice::Builtin::KindObjectProxy: case Slice::Builtin::KindLocalObject: diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index bc90db3f1b3..393aa565593 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -1331,6 +1331,7 @@ Slice::Ruby::CodeVisitor::writeType(const TypePtr& p) _out << "::Ice::T_string"; break; } + case Builtin::KindValue: case Builtin::KindObject: { _out << "::Ice::T_Object"; @@ -1391,6 +1392,7 @@ Slice::Ruby::CodeVisitor::getInitializer(const DataMemberPtr& m) { return "''"; } + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: @@ -1535,6 +1537,7 @@ Slice::Ruby::CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTr break; } + case Slice::Builtin::KindValue: case Slice::Builtin::KindObject: case Slice::Builtin::KindObjectProxy: case Slice::Builtin::KindLocalObject: diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp index 69859b0090e..7ca48429def 100644 --- a/cpp/src/Slice/Scanner.cpp +++ b/cpp/src/Slice/Scanner.cpp @@ -29,7 +29,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_SUBMINOR_VERSION 39 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -74,7 +74,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -105,6 +104,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -161,7 +162,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -173,7 +182,12 @@ typedef unsigned int flex_uint32_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int slice_leng; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t slice_leng; extern FILE *slice_in, *slice_out; @@ -182,6 +196,7 @@ extern FILE *slice_in, *slice_out; #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -199,11 +214,6 @@ extern FILE *slice_in, *slice_out; #define unput(c) yyunput( c, (yytext_ptr) ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -221,7 +231,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -291,8 +301,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when slice_text is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int slice_leng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t slice_leng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -320,7 +330,7 @@ static void slice__init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE slice__scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE slice__scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE slice__scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE slice__scan_bytes (yyconst char *bytes,yy_size_t len ); void *slice_alloc (yy_size_t ); void *slice_realloc (void *,yy_size_t ); @@ -352,7 +362,7 @@ void slice_free (void * ); /* Begin user sect3 */ -#define slice_wrap(n) 1 +#define slice_wrap() 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -554,7 +564,7 @@ char *slice_text; // // ********************************************************************** -#include // Before Grammer.h, so that YYSTYPE is defined +#include // Before Grammer.h, so that YYSTYPE is defined #include #include @@ -595,7 +605,7 @@ char *slice_text; # define slice_wrap() 1 # endif # ifdef ICE_64 -# pragma error_messages(off,truncwarn) +# pragma error_messages(off,truncwarn) # endif #endif @@ -608,7 +618,7 @@ namespace Slice // // Definitions for the case-insensitive keyword-token map. // -typedef std::map StringTokenMap; +typedef std::map StringTokenMap; static StringTokenMap keywordMap; void initScanner(); @@ -616,11 +626,11 @@ int checkKeyword(string&); } -#define YY_USER_INIT initScanner(); +#define YY_USER_INIT initScanner(); -#line 623 "lex.yy.c" +#line 633 "lex.yy.c" #define INITIAL 0 #define BOMSCAN 1 @@ -661,7 +671,7 @@ FILE *slice_get_out (void ); void slice_set_out (FILE * out_str ); -int slice_get_leng (void ); +yy_size_t slice_get_leng (void ); char *slice_get_text (void ); @@ -703,7 +713,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -722,7 +737,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( slice_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -807,11 +822,6 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 92 "Scanner.l" - - -#line 813 "lex.yy.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -838,6 +848,12 @@ YY_DECL slice__load_buffer_state( ); } + { +#line 92 "Scanner.l" + + +#line 855 "lex.yy.c" + while ( 1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -855,7 +871,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -906,6 +922,7 @@ YY_RULE_SETUP case 2: /* rule 2 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */ +YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up slice_text again */ YY_RULE_SETUP @@ -933,6 +950,7 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */ +YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up slice_text again */ YY_RULE_SETUP @@ -953,11 +971,11 @@ YY_RULE_SETUP int c; do { - c = yyinput(); - if(c == '\n') - { - unit->nextLine(); - } + c = yyinput(); + if(c == '\n') + { + unit->nextLine(); + } } while(c != '\n' && c != EOF); } @@ -971,38 +989,38 @@ YY_RULE_SETUP string comment = slice_text + 2; while(true) { - int c = yyinput(); - if(c == '\n') - { - comment += static_cast(c); - unit->nextLine(); - } - else if(c == '*') - { - int next = yyinput(); - if(next == '/') - { - break; - } - else - { - comment += static_cast(c); - unput(next); - } - } - else if(c == EOF) - { - unit->warning("EOF in comment"); - break; - } - else - { - comment += static_cast(c); - } + int c = yyinput(); + if(c == '\n') + { + comment += static_cast(c); + unit->nextLine(); + } + else if(c == '*') + { + int next = yyinput(); + if(next == '/') + { + break; + } + else + { + comment += static_cast(c); + unput(next); + } + } + else if(c == EOF) + { + unit->warning("EOF in comment"); + break; + } + else + { + comment += static_cast(c); + } } if(!comment.empty() && comment[0] == '*') { - unit->setComment(comment); + unit->setComment(comment); } } YY_BREAK @@ -1095,156 +1113,149 @@ YY_RULE_SETUP str->literal = "\""; while(true) { - char c = static_cast(yyinput()); + char c = static_cast(yyinput()); str->literal += c; - if(c == '"') - { - break; - } - else if(c == EOF) - { - unit->error("EOF in string"); - break; - } - else if(c == '\n') - { - unit->error("newline in string"); - } - else if(c == '\\') - { - char next = static_cast(yyinput()); + if(c == '"') + { + break; + } + else if(c == EOF) + { + unit->error("EOF in string"); + break; + } + else if(c == '\n') + { + unit->error("newline in string"); + } + else if(c == '\\') + { + char next = static_cast(yyinput()); str->literal += next; - switch(next) - { - case '\\': - case '"': - case '\'': - { - str->v += next; - break; - } - - case 'n': - { - str->v += '\n'; - break; - } - - case 'r': - { - str->v += '\r'; - break; - } - - case 't': - { - str->v += '\t'; - break; - } - - case 'v': - { - str->v += '\v'; - break; - } - - case 'f': - { - str->v += '\f'; - break; - } - - case 'a': - { - str->v += '\a'; - break; - } - - case 'b': - { - str->v += '\b'; - break; - } - - case '?': - { - str->v += '\?'; - break; - } - - case '0': - case '1': - case '2': - case '3': - { - static string octalDigits = "01234567"; - unsigned short us = next - '0'; - if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) - { + switch(next) + { + case '\\': + case '"': + case '\'': + { + str->v += next; + break; + } + case 'n': + { + str->v += '\n'; + break; + } + case 'r': + { + str->v += '\r'; + break; + } + case 't': + { + str->v += '\t'; + break; + } + case 'v': + { + str->v += '\v'; + break; + } + case 'f': + { + str->v += '\f'; + break; + } + + case 'a': + { + str->v += '\a'; + break; + } + + case 'b': + { + str->v += '\b'; + break; + } + + case '?': + { + str->v += '\?'; + break; + } + + case '0': + case '1': + case '2': + case '3': + { + static string octalDigits = "01234567"; + unsigned short us = next - '0'; + if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) + { str->literal += next; - us = us * 8 + next - '0'; - if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) - { - us = us * 8 + next - '0'; - } - else - { - unput(next); - } - } - else - { - unput(next); - } - if(us == 0) - { - unit->error("illegal NUL character in string constant"); - } - str->v += static_cast(us); - break; - } - case 'x': - { - IceUtil::Int64 ull = 0; - while(isxdigit(static_cast(next = static_cast(yyinput())))) - { + us = us * 8 + next - '0'; + if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) + { + us = us * 8 + next - '0'; + } + else + { + unput(next); + } + } + else + { + unput(next); + } + if(us == 0) + { + unit->error("illegal NUL character in string constant"); + } + str->v += static_cast(us); + break; + } + case 'x': + { + IceUtil::Int64 ull = 0; + while(isxdigit(static_cast(next = static_cast(yyinput())))) + { str->literal += next; - ull *= 16; - if(isdigit(static_cast(next))) - { - ull += next - '0'; - } - else if(islower(static_cast(next))) - { - ull += next - 'a' + 10; - } - else - { - ull += next - 'A' + 10; - } - } - unput(next); - if(ull == 0) - { - unit->error("illegal NUL character in string constant"); - } - str->v += static_cast(ull); - break; - } - - // TODO: add universal character names - - default: - { - str->v += c; - unput(next); - } - } - } - else - { - str->v += c; - } + ull *= 16; + if(isdigit(static_cast(next))) + { + ull += next - '0'; + } + else if(islower(static_cast(next))) + { + ull += next - 'a' + 10; + } + else + { + ull += next - 'A' + 10; + } + } + unput(next); + if(ull == 0) + { + unit->error("illegal NUL character in string constant"); + } + str->v += static_cast(ull); + break; + } + // TODO: add universal character names + default: + { + str->v += c; + unput(next); + } + } + } + else + { + str->v += c; + } } *yylvalp = str; return ICE_STRING_LITERAL; @@ -1252,7 +1263,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 397 "Scanner.l" +#line 390 "Scanner.l" { BEGIN(MAINSCAN); IntegerTokPtr itp = new IntegerTok; @@ -1260,18 +1271,18 @@ YY_RULE_SETUP *yylvalp = itp; if(!IceUtilInternal::stringToInt64(string(slice_text), itp->v)) { - assert(itp->v != 0); - string msg = "integer constant `"; - msg += slice_text; - msg += "' out of range"; - unit->error(msg); + assert(itp->v != 0); + string msg = "integer constant `"; + msg += slice_text; + msg += "' out of range"; + unit->error(msg); } return ICE_INTEGER_LITERAL; } YY_BREAK case 16: YY_RULE_SETUP -#line 413 "Scanner.l" +#line 406 "Scanner.l" { BEGIN(MAINSCAN); errno = 0; @@ -1282,22 +1293,22 @@ YY_RULE_SETUP char lastChar = literal[literal.size() - 1]; if(lastChar == 'f' || lastChar == 'F') { - literal = literal.substr(0, literal.size() - 1); // Clobber trailing 'f' or 'F' suffix + literal = literal.substr(0, literal.size() - 1); // Clobber trailing 'f' or 'F' suffix } ftp->v = strtod(literal.c_str(), 0); if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE) { - string msg = "floating-point constant `"; - msg += slice_text; - msg += "' too large (overflow)"; - unit->error(msg); + string msg = "floating-point constant `"; + msg += slice_text; + msg += "' too large (overflow)"; + unit->error(msg); } else if(ftp->v == 0 && errno == ERANGE) { - string msg = "floating-point constant `"; - msg += slice_text; - msg += "' too small (underflow)"; - unit->error(msg); + string msg = "floating-point constant `"; + msg += slice_text; + msg += "' too small (underflow)"; + unit->error(msg); } return ICE_FLOATING_POINT_LITERAL; } @@ -1305,54 +1316,54 @@ YY_RULE_SETUP case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 443 "Scanner.l" +#line 436 "Scanner.l" { // Ignore white-space - + if(unit->currentLine() != 0) { BEGIN(MAINSCAN); } if(slice_text[0] == '\n') { - unit->nextLine(); + unit->nextLine(); } } YY_BREAK case 18: YY_RULE_SETUP -#line 456 "Scanner.l" +#line 449 "Scanner.l" { // Ignore UTF-8 BOM, rule only active when parsing start of file. - + BEGIN(MAINSCAN); } YY_BREAK case 19: YY_RULE_SETUP -#line 462 "Scanner.l" +#line 455 "Scanner.l" { BEGIN(MAINSCAN); if(slice_text[0] < 32 || slice_text[0] > 126) { - stringstream s; - s << "illegal input character: '\\"; - s.width(3); - s.fill('0'); - s << oct << static_cast(static_cast(slice_text[0])); - s << "'"; - unit->error(s.str()); - return BAD_CHAR; + stringstream s; + s << "illegal input character: '\\"; + s.width(3); + s.fill('0'); + s << oct << static_cast(static_cast(slice_text[0])); + s << "'"; + unit->error(s.str()); + return BAD_CHAR; } return slice_text[0]; } YY_BREAK case 20: YY_RULE_SETUP -#line 478 "Scanner.l" +#line 471 "Scanner.l" ECHO; YY_BREAK -#line 1355 "lex.yy.c" +#line 1366 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(BOMSCAN): case YY_STATE_EOF(MAINSCAN): @@ -1486,6 +1497,7 @@ case YY_STATE_EOF(MAINSCAN): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of slice_lex */ /* yy_get_next_buffer - try to read in a new buffer @@ -1541,21 +1553,21 @@ static int yy_get_next_buffer (void) else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1586,7 +1598,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -1682,7 +1694,7 @@ static int yy_get_next_buffer (void) yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 72); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } static void yyunput (int c, register char * yy_bp ) @@ -1697,7 +1709,7 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; + register yy_size_t number_to_move = (yy_n_chars) + 2; register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = @@ -1746,7 +1758,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2020,7 +2032,7 @@ void slice_pop_buffer_state (void) */ static void slice_ensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -2112,17 +2124,17 @@ YY_BUFFER_STATE slice__scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to slice_lex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE slice__scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE slice__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - int i; + yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -2204,7 +2216,7 @@ FILE *slice_get_out (void) /** Get the length of the current token. * */ -int slice_get_leng (void) +yy_size_t slice_get_leng (void) { return slice_leng; } @@ -2352,7 +2364,7 @@ void slice_free (void * ptr ) #define YYTABLES_NAME "yytables" -#line 478 "Scanner.l" +#line 470 "Scanner.l" @@ -2394,6 +2406,7 @@ initScanner() keywordMap["true"] = ICE_TRUE; keywordMap["idempotent"] = ICE_IDEMPOTENT; keywordMap["optional"] = ICE_OPTIONAL; + keywordMap["Value"] = ICE_VALUE; } // @@ -2409,15 +2422,15 @@ checkKeyword(string& id) StringTokenMap::const_iterator pos = keywordMap.find(id); if(pos != keywordMap.end()) { - if(pos->first != id) - { - string msg; - msg = "illegal identifier: `" + id + "' differs from keyword `"; - msg += pos->first + "' only in capitalization"; - unit->error(msg); - id = pos->first; - } - return pos->second; + if(pos->first != id) + { + string msg; + msg = "illegal identifier: `" + id + "' differs from keyword `"; + msg += pos->first + "' only in capitalization"; + unit->error(msg); + id = pos->first; + } + return pos->second; } return ICE_IDENTIFIER; } diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l index 9821508df30..0e7eef5a7fe 100644 --- a/cpp/src/Slice/Scanner.l +++ b/cpp/src/Slice/Scanner.l @@ -9,7 +9,7 @@ // // ********************************************************************** -#include // Before Grammer.h, so that YYSTYPE is defined +#include // Before Grammer.h, so that YYSTYPE is defined #include #include @@ -50,7 +50,7 @@ # define slice_wrap() 1 # endif # ifdef ICE_64 -# pragma error_messages(off,truncwarn) +# pragma error_messages(off,truncwarn) # endif #endif @@ -63,7 +63,7 @@ namespace Slice // // Definitions for the case-insensitive keyword-token map. // -typedef std::map StringTokenMap; +typedef std::map StringTokenMap; static StringTokenMap keywordMap; void initScanner(); @@ -71,7 +71,7 @@ int checkKeyword(string&); } -#define YY_USER_INIT initScanner(); +#define YY_USER_INIT initScanner(); %} @@ -80,11 +80,11 @@ int checkKeyword(string&); %option prefix="slice_" %option outfile="lex.yy.c" -identifier \\?[[:alpha:]_][[:alnum:]_]* -integer_constant (\+|-)?((0[0-7]+)|(0x[[:xdigit:]]+)|([[:digit:]]+)) -fractional_constant (\+|-)?(([[:digit:]]*\.[[:digit:]]+)|([[:digit:]]+\.)) -exponent_part (e|E)(\+|-)?[[:digit:]]+ -floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{exponent_part}))[fF]? +identifier \\?[[:alpha:]_][[:alnum:]_]* +integer_constant (\+|-)?((0[0-7]+)|(0x[[:xdigit:]]+)|([[:digit:]]+)) +fractional_constant (\+|-)?(([[:digit:]]*\.[[:digit:]]+)|([[:digit:]]+\.)) +exponent_part (e|E)(\+|-)?[[:digit:]]+ +floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{exponent_part}))[fF]? %s BOMSCAN %s MAINSCAN @@ -125,11 +125,11 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e int c; do { - c = yyinput(); - if(c == '\n') - { - unit->nextLine(); - } + c = yyinput(); + if(c == '\n') + { + unit->nextLine(); + } } while(c != '\n' && c != EOF); } @@ -140,38 +140,38 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e string comment = yytext + 2; while(true) { - int c = yyinput(); - if(c == '\n') - { - comment += static_cast(c); - unit->nextLine(); - } - else if(c == '*') - { - int next = yyinput(); - if(next == '/') - { - break; - } - else - { - comment += static_cast(c); - unput(next); - } - } - else if(c == EOF) - { - unit->warning("EOF in comment"); - break; - } - else - { - comment += static_cast(c); - } + int c = yyinput(); + if(c == '\n') + { + comment += static_cast(c); + unit->nextLine(); + } + else if(c == '*') + { + int next = yyinput(); + if(next == '/') + { + break; + } + else + { + comment += static_cast(c); + unput(next); + } + } + else if(c == EOF) + { + unit->warning("EOF in comment"); + break; + } + else + { + comment += static_cast(c); + } } if(!comment.empty() && comment[0] == '*') { - unit->setComment(comment); + unit->setComment(comment); } } @@ -239,156 +239,149 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e str->literal = "\""; while(true) { - char c = static_cast(yyinput()); + char c = static_cast(yyinput()); str->literal += c; - if(c == '"') - { - break; - } - else if(c == EOF) - { - unit->error("EOF in string"); - break; - } - else if(c == '\n') - { - unit->error("newline in string"); - } - else if(c == '\\') - { - char next = static_cast(yyinput()); + if(c == '"') + { + break; + } + else if(c == EOF) + { + unit->error("EOF in string"); + break; + } + else if(c == '\n') + { + unit->error("newline in string"); + } + else if(c == '\\') + { + char next = static_cast(yyinput()); str->literal += next; - switch(next) - { - case '\\': - case '"': - case '\'': - { - str->v += next; - break; - } - - case 'n': - { - str->v += '\n'; - break; - } - - case 'r': - { - str->v += '\r'; - break; - } - - case 't': - { - str->v += '\t'; - break; - } - - case 'v': - { - str->v += '\v'; - break; - } - - case 'f': - { - str->v += '\f'; - break; - } - - case 'a': - { - str->v += '\a'; - break; - } - - case 'b': - { - str->v += '\b'; - break; - } - - case '?': - { - str->v += '\?'; - break; - } - - case '0': - case '1': - case '2': - case '3': - { - static string octalDigits = "01234567"; - unsigned short us = next - '0'; - if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) - { + switch(next) + { + case '\\': + case '"': + case '\'': + { + str->v += next; + break; + } + case 'n': + { + str->v += '\n'; + break; + } + case 'r': + { + str->v += '\r'; + break; + } + case 't': + { + str->v += '\t'; + break; + } + case 'v': + { + str->v += '\v'; + break; + } + case 'f': + { + str->v += '\f'; + break; + } + + case 'a': + { + str->v += '\a'; + break; + } + + case 'b': + { + str->v += '\b'; + break; + } + + case '?': + { + str->v += '\?'; + break; + } + + case '0': + case '1': + case '2': + case '3': + { + static string octalDigits = "01234567"; + unsigned short us = next - '0'; + if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) + { str->literal += next; - us = us * 8 + next - '0'; - if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) - { - us = us * 8 + next - '0'; - } - else - { - unput(next); - } - } - else - { - unput(next); - } - if(us == 0) - { - unit->error("illegal NUL character in string constant"); - } - str->v += static_cast(us); - break; - } - case 'x': - { - IceUtil::Int64 ull = 0; - while(isxdigit(static_cast(next = static_cast(yyinput())))) - { + us = us * 8 + next - '0'; + if(octalDigits.find_first_of(next = static_cast(yyinput())) != string::npos) + { + us = us * 8 + next - '0'; + } + else + { + unput(next); + } + } + else + { + unput(next); + } + if(us == 0) + { + unit->error("illegal NUL character in string constant"); + } + str->v += static_cast(us); + break; + } + case 'x': + { + IceUtil::Int64 ull = 0; + while(isxdigit(static_cast(next = static_cast(yyinput())))) + { str->literal += next; - ull *= 16; - if(isdigit(static_cast(next))) - { - ull += next - '0'; - } - else if(islower(static_cast(next))) - { - ull += next - 'a' + 10; - } - else - { - ull += next - 'A' + 10; - } - } - unput(next); - if(ull == 0) - { - unit->error("illegal NUL character in string constant"); - } - str->v += static_cast(ull); - break; - } - - // TODO: add universal character names - - default: - { - str->v += c; - unput(next); - } - } - } - else - { - str->v += c; - } + ull *= 16; + if(isdigit(static_cast(next))) + { + ull += next - '0'; + } + else if(islower(static_cast(next))) + { + ull += next - 'a' + 10; + } + else + { + ull += next - 'A' + 10; + } + } + unput(next); + if(ull == 0) + { + unit->error("illegal NUL character in string constant"); + } + str->v += static_cast(ull); + break; + } + // TODO: add universal character names + default: + { + str->v += c; + unput(next); + } + } + } + else + { + str->v += c; + } } *yylvalp = str; return ICE_STRING_LITERAL; @@ -401,11 +394,11 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e *yylvalp = itp; if(!IceUtilInternal::stringToInt64(string(yytext), itp->v)) { - assert(itp->v != 0); - string msg = "integer constant `"; - msg += yytext; - msg += "' out of range"; - unit->error(msg); + assert(itp->v != 0); + string msg = "integer constant `"; + msg += yytext; + msg += "' out of range"; + unit->error(msg); } return ICE_INTEGER_LITERAL; } @@ -420,42 +413,42 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e char lastChar = literal[literal.size() - 1]; if(lastChar == 'f' || lastChar == 'F') { - literal = literal.substr(0, literal.size() - 1); // Clobber trailing 'f' or 'F' suffix + literal = literal.substr(0, literal.size() - 1); // Clobber trailing 'f' or 'F' suffix } ftp->v = strtod(literal.c_str(), 0); if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE) { - string msg = "floating-point constant `"; - msg += yytext; - msg += "' too large (overflow)"; - unit->error(msg); + string msg = "floating-point constant `"; + msg += yytext; + msg += "' too large (overflow)"; + unit->error(msg); } else if(ftp->v == 0 && errno == ERANGE) { - string msg = "floating-point constant `"; - msg += yytext; - msg += "' too small (underflow)"; - unit->error(msg); + string msg = "floating-point constant `"; + msg += yytext; + msg += "' too small (underflow)"; + unit->error(msg); } return ICE_FLOATING_POINT_LITERAL; } [[:space:]] { // Ignore white-space - + if(unit->currentLine() != 0) { BEGIN(MAINSCAN); } if(yytext[0] == '\n') { - unit->nextLine(); + unit->nextLine(); } } ^"\357\273\277" { // Ignore UTF-8 BOM, rule only active when parsing start of file. - + BEGIN(MAINSCAN); } @@ -463,14 +456,14 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e BEGIN(MAINSCAN); if(yytext[0] < 32 || yytext[0] > 126) { - stringstream s; - s << "illegal input character: '\\"; - s.width(3); - s.fill('0'); - s << oct << static_cast(static_cast(yytext[0])); - s << "'"; - unit->error(s.str()); - return BAD_CHAR; + stringstream s; + s << "illegal input character: '\\"; + s.width(3); + s.fill('0'); + s << oct << static_cast(static_cast(yytext[0])); + s << "'"; + unit->error(s.str()); + return BAD_CHAR; } return yytext[0]; } @@ -515,6 +508,7 @@ initScanner() keywordMap["true"] = ICE_TRUE; keywordMap["idempotent"] = ICE_IDEMPOTENT; keywordMap["optional"] = ICE_OPTIONAL; + keywordMap["Value"] = ICE_VALUE; } // @@ -530,15 +524,15 @@ checkKeyword(string& id) StringTokenMap::const_iterator pos = keywordMap.find(id); if(pos != keywordMap.end()) { - if(pos->first != id) - { - string msg; - msg = "illegal identifier: `" + id + "' differs from keyword `"; - msg += pos->first + "' only in capitalization"; - unit->error(msg); - id = pos->first; - } - return pos->second; + if(pos->first != id) + { + string msg; + msg = "illegal identifier: `" + id + "' differs from keyword `"; + msg += pos->first + "' only in capitalization"; + unit->error(msg); + id = pos->first; + } + return pos->second; } return ICE_IDENTIFIER; } diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak index d33f2323c71..534c957158c 100755 --- a/cpp/src/iceserviceinstall/.depend.mak +++ b/cpp/src/iceserviceinstall/.depend.mak @@ -16,6 +16,7 @@ ServiceInstaller.obj: \ "$(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" \ @@ -24,6 +25,7 @@ ServiceInstaller.obj: \ "$(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" \ @@ -64,7 +66,7 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -78,6 +80,7 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -89,7 +92,6 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -112,7 +114,6 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -144,6 +145,7 @@ Install.obj: \ "$(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" \ @@ -152,6 +154,7 @@ Install.obj: \ "$(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" \ @@ -192,7 +195,7 @@ Install.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -206,6 +209,7 @@ Install.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -217,7 +221,6 @@ Install.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -240,7 +243,6 @@ Install.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index e9e771bf64f..c0ae7f2fa25 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -29,6 +29,56 @@ using namespace IceUtilInternal; namespace { +bool +isConstexprType(const TypePtr& type) +{ + BuiltinPtr bp = BuiltinPtr::dynamicCast(type); + if(bp) + { + switch(bp->kind()) + { + case Builtin::KindByte: + case Builtin::KindBool: + case Builtin::KindShort: + case Builtin::KindInt: + case Builtin::KindLong: + case Builtin::KindFloat: + case Builtin::KindDouble: + case Builtin::KindValue: + case Builtin::KindObject: + case Builtin::KindObjectProxy: + { + return true; + } + default: + { + return false; + } + } + } + else if(EnumPtr::dynamicCast(type) || ProxyPtr::dynamicCast(type) || ClassDeclPtr::dynamicCast(type)) + { + return true; + } + else + { + StructPtr s = StructPtr::dynamicCast(type); + if(s) + { + DataMemberList members = s->dataMembers(); + for(DataMemberList::const_iterator i = members.begin(); i != members.end(); ++i) + { + if(!isConstexprType((*i)->type())) + { + return false; + } + } + return true; + } + return false; + } +} + string getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2) { @@ -48,7 +98,7 @@ getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2) void writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const SyntaxTreeBasePtr& valueType, - const string& value, int useWstring, const StringList& metaData) + const string& value, int useWstring, const StringList& metaData, bool cpp11 = false) { ConstPtr constant = ConstPtr::dynamicCast(valueType); if(constant) @@ -108,7 +158,14 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt } else if(bp && bp->kind() == Builtin::KindLong) { - out << "ICE_INT64(" << value << ")"; + if(cpp11) + { + out << value << "LL"; + } + else + { + out << "ICE_INT64(" << value << ")"; + } } else if(bp && bp->kind() == Builtin::KindFloat) { @@ -364,10 +421,10 @@ Slice::Gen::generate(const UnitPtr& p) C << _base << "." << _headerExtension << ">"; C << "\n#include "; - H << "\n#include "; H << "\n#include "; H << "\n#include "; + H << "\n#include "; H << "\n#include "; H << "\n#include "; H << "\n#include "; @@ -375,7 +432,9 @@ Slice::Gen::generate(const UnitPtr& p) if(p->hasNonLocalClassDefs()) { H << "\n#include "; + H << "\n#include "; H << "\n#include "; + H << "\n#include "; H << "\n#include "; H << "\n#include "; if(p->hasContentsWithMetaData("amd")) @@ -398,7 +457,7 @@ Slice::Gen::generate(const UnitPtr& p) H << "\n#include "; } - if(p->hasNonLocalDataOnlyClasses() || p->hasNonLocalExceptions()) + if(p->hasNonLocalClassDefs() || p->hasNonLocalExceptions()) { H << "\n#include "; } @@ -482,95 +541,203 @@ Slice::Gen::generate(const UnitPtr& p) _dllExport += " "; } - ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport); - p->visit(&proxyDeclVisitor, false); + H << sp; + H.zeroIndent(); + H << nl << "#ifndef ICE_CPP11_MAPPING // C++98 mapping"; + H.restoreIndent(); + + C << sp; + C.zeroIndent(); + C << nl << "#ifndef ICE_CPP11_MAPPING // C++98 mapping"; + C.restoreIndent(); + { + ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport); + p->visit(&proxyDeclVisitor, false); - ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport); - p->visit(&objectDeclVisitor, false); + ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport); + p->visit(&objectDeclVisitor, false); - TypesVisitor typesVisitor(H, C, _dllExport, _stream); - p->visit(&typesVisitor, false); + TypesVisitor typesVisitor(H, C, _dllExport, _stream); + p->visit(&typesVisitor, false); - StreamVisitor streamVisitor(H, C, _dllExport); - p->visit(&streamVisitor, false); + StreamVisitor streamVisitor(H, C, _dllExport); + p->visit(&streamVisitor, false); - AsyncVisitor asyncVisitor(H, C, _dllExport); - p->visit(&asyncVisitor, false); + AsyncVisitor asyncVisitor(H, C, _dllExport); + p->visit(&asyncVisitor, false); - AsyncImplVisitor asyncImplVisitor(H, C, _dllExport); - p->visit(&asyncImplVisitor, false); + AsyncImplVisitor asyncImplVisitor(H, C, _dllExport); + p->visit(&asyncImplVisitor, false); - // - // The templates are emitted before the proxy definition - // so the derivation hierarchy is known to the proxy: - // the proxy relies on knowing the hierarchy to make the begin_ - // methods type-safe. - // - AsyncCallbackVisitor asyncCallbackVisitor(H, C, _dllExport); - p->visit(&asyncCallbackVisitor, false); + // + // The templates are emitted before the proxy definition + // so the derivation hierarchy is known to the proxy: + // the proxy relies on knowing the hierarchy to make the begin_ + // methods type-safe. + // + AsyncCallbackVisitor asyncCallbackVisitor(H, C, _dllExport); + p->visit(&asyncCallbackVisitor, false); - ProxyVisitor proxyVisitor(H, C, _dllExport); - p->visit(&proxyVisitor, false); + ProxyVisitor proxyVisitor(H, C, _dllExport); + p->visit(&proxyVisitor, false); - ObjectVisitor objectVisitor(H, C, _dllExport, _stream); - p->visit(&objectVisitor, false); + ObjectVisitor objectVisitor(H, C, _dllExport, _stream); + p->visit(&objectVisitor, false); - // - // We need to delay generating the template after the proxy - // definition, because completed calls the begin_ method in the - // proxy. - // - AsyncCallbackTemplateVisitor asyncCallbackTemplateVisitor(H, C, _dllExport); - p->visit(&asyncCallbackTemplateVisitor, false); + // + // We need to delay generating the template after the proxy + // definition, because completed calls the begin_ method in the + // proxy. + // + AsyncCallbackTemplateVisitor asyncCallbackTemplateVisitor(H, C, _dllExport); + p->visit(&asyncCallbackTemplateVisitor, false); - if(_impl) - { - implH << "\n#include <"; - if(_include.size()) + if(_impl) { - implH << _include << '/'; - } - implH << _base << "." << _headerExtension << ">"; + implH << "\n#include <"; + if(_include.size()) + { + implH << _include << '/'; + } + implH << _base << "." << _headerExtension << ">"; - writeExtraHeaders(implC); + writeExtraHeaders(implC); - implC << "\n#include <"; - if(_include.size()) - { - implC << _include << '/'; + implC << "\n#include <"; + if(_include.size()) + { + implC << _include << '/'; + } + implC << _base << "I." << _implHeaderExtension << ">"; + + ImplVisitor implVisitor(implH, implC, _dllExport); + p->visit(&implVisitor, false); } - implC << _base << "I." << _implHeaderExtension << ">"; - ImplVisitor implVisitor(implH, implC, _dllExport); - p->visit(&implVisitor, false); + if(_checksum) + { + ChecksumMap map = createChecksums(p); + if(!map.empty()) + { + C << sp << nl << "namespace"; + C << nl << "{"; + C << sp << nl << "const char* __sliceChecksums[] ="; + C << sb; + for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q) + { + C << nl << "\"" << q->first << "\", \""; + ostringstream str; + str.flags(ios_base::hex); + str.fill('0'); + for(vector::const_iterator r = q->second.begin(); r != q->second.end(); ++r) + { + str << static_cast(*r); + } + C << str.str() << "\","; + } + C << nl << "0"; + C << eb << ';'; + C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);"; + C << sp << nl << "}"; + } + } } + H << sp; + H.zeroIndent(); + H << nl << "#else // C++11 mapping"; + H.restoreIndent(); - if(_checksum) + C << sp; + C.zeroIndent(); + C << nl << "#else // C++11 mapping"; + C.restoreIndent(); { - ChecksumMap map = createChecksums(p); - if(!map.empty()) + Cpp11ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport); + p->visit(&proxyDeclVisitor, false); + + Cpp11ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport); + p->visit(&objectDeclVisitor, false); + + Cpp11TypesVisitor typesVisitor(H, C, _dllExport, _stream); + p->visit(&typesVisitor, false); + + Cpp11StreamVisitor streamVisitor(H, C, _dllExport); + p->visit(&streamVisitor, false); + + Cpp11ProxyVisitor proxyVisitor(H, C, _dllExport); + p->visit(&proxyVisitor, false); + + Cpp11InterfaceTraitsVisitor interfaceTraitsVisitor(H, C, _dllExport); + p->visit(&interfaceTraitsVisitor, false); + + Cpp11LocalObjectVisitor localObjectVisitor(H, C, _dllExport, _stream); + p->visit(&localObjectVisitor, false); + + Cpp11InterfaceVisitor interfaceVisitor(H, C, _dllExport, _stream); + p->visit(&interfaceVisitor, false); + + Cpp11ValueVisitor valueVisitor(H, C, _dllExport, _stream); + p->visit(&valueVisitor, false); + + // TODO + /*if(_impl) { - C << sp << nl << "namespace"; - C << nl << "{"; - C << sp << nl << "const char* __sliceChecksums[] ="; - C << sb; - for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q) + implH << "\n#include <"; + if(_include.size()) + { + implH << _include << '/'; + } + implH << _base << "." << _headerExtension << ">"; + + writeExtraHeaders(implC); + + implC << "\n#include <"; + if(_include.size()) + { + implC << _include << '/'; + } + implC << _base << "I." << _implHeaderExtension << ">"; + + ImplVisitor implVisitor(implH, implC, _dllExport); + p->visit(&implVisitor, false); + } + + if(_checksum) + { + ChecksumMap map = createChecksums(p); + if(!map.empty()) { - C << nl << "\"" << q->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector::const_iterator r = q->second.begin(); r != q->second.end(); ++r) + C << sp << nl << "namespace"; + C << nl << "{"; + C << sp << nl << "const char* __sliceChecksums[] ="; + C << sb; + for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q) { - str << static_cast(*r); + C << nl << "\"" << q->first << "\", \""; + ostringstream str; + str.flags(ios_base::hex); + str.fill('0'); + for(vector::const_iterator r = q->second.begin(); r != q->second.end(); ++r) + { + str << static_cast(*r); + } + C << str.str() << "\","; } - C << str.str() << "\","; + C << nl << "0"; + C << eb << ';'; + C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);"; + C << sp << nl << "}"; } - C << nl << "0"; - C << eb << ';'; - C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);"; - C << sp << nl << "}"; - } + }*/ + H << sp; + H.zeroIndent(); + H << nl << "#endif"; + H.restoreIndent(); + + C << sp; + C.zeroIndent(); + C << nl << "#endif"; + C.restoreIndent(); } } @@ -1789,16 +1956,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) string thisPointer = fixKwd(scope.substr(0, scope.size() - 2)) + "*"; string deprecateSymbol = getDeprecateSymbol(p, cl); - H << sp << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << epar; - H << sb; - H << nl; - if(ret) - { - H << "return "; - } - H << fixKwd(name) << spar << args << "0" << epar << ';'; - H << eb; - H << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << "const ::Ice::Context& __ctx" + H << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << "const ::Ice::Context& __ctx = ::Ice::noExplicitContext" << epar; H << sb; H << nl; @@ -1810,7 +1968,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) H << eb; H.zeroIndent(); - H << nl << "#ifdef ICE_CPP11"; + H << nl << "#ifdef ICE_CPP11_COMPILER"; H.restoreIndent(); string retEndArg = getEndArg(ret, p->getMetaData(), "__ret"); @@ -1845,12 +2003,12 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) H << sb; if(p->returnsData()) { - H << nl << "return __begin_" << name << spar << argsAMI << "0, __response, __exception, __sent" << epar << ";"; + H << nl << "return __begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext, __response, __exception, __sent" << epar << ";"; } else { H << nl << "return begin_" << name << spar << argsAMI - << "0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent)" << epar << ";"; + << "&::Ice::noExplicitContext, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent)" << epar << ";"; } H << eb; @@ -1872,7 +2030,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) << "const ::IceInternal::Function& __sent = " "::IceInternal::Function()" << epar; H << sb; - H << nl << "return begin_" << name << spar << argsAMI << "0, ::Ice::newCallback(__completed, __sent), 0" << epar << ";"; + H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext, ::Ice::newCallback(__completed, __sent), 0" << epar << ";"; H << eb; // @@ -1994,7 +2152,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI << epar; H << sb; - H << nl << "return begin_" << name << spar << argsAMI << "0" << "::IceInternal::__dummyCallback" << "0" + H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext" << "::IceInternal::__dummyCallback" << "0" << epar << ';'; H << eb; @@ -2009,7 +2167,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) << "const ::Ice::CallbackPtr& __del" << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar; H << sb; - H << nl << "return begin_" << name << spar << argsAMI << "0" << "__del" << "__cookie" << epar << ';'; + H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext" << "__del" << "__cookie" << epar << ';'; H << eb; H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI @@ -2024,7 +2182,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) << "const " + delNameScoped + "Ptr& __del" << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar; H << sb; - H << nl << "return begin_" << name << spar << argsAMI << "0" << "__del" << "__cookie" << epar << ';'; + H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext" << "__del" << "__cookie" << epar << ';'; H << eb; H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI @@ -2206,7 +2364,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) if(p->returnsData()) { - C << nl << nl << "#ifdef ICE_CPP11"; + C << nl << nl << "#ifdef ICE_CPP11_COMPILER"; // // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to @@ -2335,7 +2493,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) { C << nl << "#endif"; } - C << nl << "#endif"; // ICE_CPP11 + C << nl << "#endif"; // ICE_CPP11_COMPILER } C << sp << nl << retS << nl << "IceProxy" << scope << "end_" << name << spar << outParamsDeclAMI @@ -2445,6 +2603,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());"; C << eb; C << eb; + if(ret || !outParams.empty()) { C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();"; @@ -2504,6 +2663,7 @@ Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p) H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);"; H << nl << "typedef ::IceInternal::Handle< " << scoped << "> " << p->name() << "Ptr;"; H << nl << "typedef ::IceInternal::ProxyHandle< ::IceProxy" << scoped << "> " << p->name() << "Prx;"; + H << nl << "typedef " << p->name() << "Prx " << p->name() << "PrxPtr;"; H << nl << _dllExport << "void __patch(" << p->name() << "Ptr&, const ::Ice::ObjectPtr&);"; } else @@ -2816,8 +2976,6 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) C << sb; if(!p->isAbstract()) { - - C << nl << "::Ice::Object* __p = new " << name << "(*this);"; C << nl << "return __p;"; } @@ -4050,7 +4208,6 @@ void Slice::Gen::AsyncCallbackTemplateVisitor::visitModuleEnd(const ModulePtr&) { _useWstring = resetUseWstring(_useWstringHist); - H << sp << nl << '}'; } @@ -4354,6 +4511,7 @@ Slice::Gen::ImplVisitor::writeDecl(Output& out, const string& name, const TypePt break; } case Builtin::KindString: + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: @@ -4405,6 +4563,7 @@ Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type, const Str out << nl << "return ::std::string();"; break; } + case Builtin::KindValue: case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: @@ -5448,14 +5607,20 @@ void Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const StringList& metaData, const string& file, const string& line, bool /*inParam*/) { - static const string prefix = "cpp:"; + static const string cppPrefix = "cpp:"; + static const string cpp11Prefix = "cpp11:"; + for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p) { string s = *p; if(_history.count(s) == 0) { - if(s.find(prefix) == 0) + bool cpp = s.find(cppPrefix) == 0; + bool cpp11 = s.find(cpp11Prefix) == 0; + if(cpp || cpp11) { + const string prefix = cpp ? cppPrefix : cpp11Prefix; + string ss = s.substr(prefix.size()); if(ss == "type:wstring" || ss == "type:string") { @@ -5491,14 +5656,30 @@ Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const Strin { continue; } - if(ClassDefPtr::dynamicCast(cont) && ss == "virtual") + { - continue; + ClassDefPtr cl = ClassDefPtr::dynamicCast(cont); + if(cl && ((cpp && ss == "virtual") || (cpp11 && cl->isLocal() && ss.find("type:") == 0))) + { + continue; + } } if(ExceptionPtr::dynamicCast(cont) && ss == "ice_print") { continue; } + if(EnumPtr::dynamicCast(cont) && ss == "unscoped") + { + continue; + } + + { + ClassDeclPtr cl = ClassDeclPtr::dynamicCast(cont); + if(cl && cpp11 && cl->isLocal() && ss.find("type:") == 0) + { + continue; + } + } emitWarning(file, line, "ignoring invalid metadata `" + s + "'"); } _history.insert(s); @@ -5544,3 +5725,3208 @@ Slice::Gen::getHeaderExt(const string& file, const UnitPtr& unit) } return ext; } + +// C++11 visitors +Slice::Gen::Cpp11ObjectDeclVisitor::Cpp11ObjectDeclVisitor(Output& h, Output& c, const string& dllExport) : + H(h), C(c), _dllExport(dllExport) +{ +} + +bool +Slice::Gen::Cpp11ObjectDeclVisitor::visitModuleStart(const ModulePtr& p) +{ + if(!p->hasClassDecls()) + { + return false; + } + + string name = fixKwd(p->name()); + + H << sp << nl << "namespace " << name << nl << '{'; + C << sp << nl << "namespace" << nl << "{"; + return true; +} + +void +Slice::Gen::Cpp11ObjectDeclVisitor::visitModuleEnd(const ModulePtr&) +{ + H << sp << nl << '}'; + C << sp << nl << "}"; +} + +void +Slice::Gen::Cpp11ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p) +{ + string t; + if(p->isLocal() && findMetaData("cpp11:type", p, t)) + { + return; + } + string name = fixKwd(p->name()); + string scoped = fixKwd(p->scoped()); + + + if(p->isLocal()) + { + H << sp << nl << "class " << name << ';'; + H << nl << "typedef ::std::shared_ptr< " << name << "> " << p->name() << "Ptr;"; + } + if(p->isInterface()) + { + H << sp << nl << "class " << name << ';'; + H << nl << "typedef ::std::shared_ptr< " << name << "> " << p->name() << "Ptr;"; + } + else // Value class + { + H << sp << nl << "class " << name << ';'; + H << nl << "typedef ::std::shared_ptr< " << name << "> " << p->name() << "Ptr;"; + H << nl << _dllExport << "void __patch(" << p->name() << "Ptr&, const ::Ice::ValuePtr&);"; + } +} + +void +Slice::Gen::Cpp11ObjectDeclVisitor::visitOperation(const OperationPtr& p) +{ + ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container()); + if(cl && !cl->isLocal()) + { + string flatName = p->flattenedScope() + p->name() + "_name"; + C << sp << nl << "const ::std::string " << flatName << " = \"" << p->name() << "\";"; + } +} + +Slice::Gen::Cpp11TypesVisitor::Cpp11TypesVisitor(Output& h, Output& c, const string& dllExport, bool stream) : + H(h), C(c), _dllExport(dllExport), _stream(stream), _doneStaticSymbol(false), _useWstring(false) +{ +} + +bool +Slice::Gen::Cpp11TypesVisitor::visitModuleStart(const ModulePtr& p) +{ + if(!p->hasOtherConstructedOrExceptions()) + { + return false; + } + + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + + H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{'; + + return true; +} + +void +Slice::Gen::Cpp11TypesVisitor::visitModuleEnd(const ModulePtr&) +{ + H << sp << nl << '}'; + + _useWstring = resetUseWstring(_useWstringHist); +} + +bool +Slice::Gen::Cpp11TypesVisitor::visitClassDefStart(const ClassDefPtr&) +{ + return false; +} + +bool +Slice::Gen::Cpp11TypesVisitor::visitExceptionStart(const ExceptionPtr& p) +{ + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + + string name = fixKwd(p->name()); + string scoped = fixKwd(p->scoped()); + ExceptionPtr base = p->base(); + DataMemberList dataMembers = p->dataMembers(); + DataMemberList allDataMembers = p->allDataMembers(); + bool hasDefaultValues = p->hasDefaultValues(); + + vector params; + vector allTypes; + vector allParamDecls; + vector baseParams; + + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + params.push_back(fixKwd((*q)->name())); + } + + for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q) + { + string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring); + allTypes.push_back(typeName); + allParamDecls.push_back(typeName + " __ice_" + fixKwd((*q)->name())); + } + + if(base) + { + DataMemberList baseDataMembers = base->allDataMembers(); + for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q) + { + baseParams.push_back("__ice_" + fixKwd((*q)->name())); + } + } + + H << sp << nl << "class " << _dllExport << name << " : "; + H.useCurrentPosAsIndent(); + H << "public "; + if(!base) + { + H << (p->isLocal() ? "::Ice::LocalException" : "::Ice::UserException"); + } + else + { + H << fixKwd(base->scoped()); + } + H.restoreIndent(); + H << sb; + + H.dec(); + H << nl << "public:"; + H.inc(); + + H << sp << nl << name << spar; + if(p->isLocal()) + { + H << "const char*" << "int"; + } + H << epar; + if(!p->isLocal() && !hasDefaultValues) + { + H << " {}"; + } + else + { + H << ';'; + } + if(!allTypes.empty()) + { + H << nl; + if(!p->isLocal() && allTypes.size() == 1) + { + H << "explicit "; + } + H << name << spar; + if(p->isLocal()) + { + H << "const char*" << "int"; + } + H << allTypes << epar << ';'; + } + H << nl << "virtual ~" << name << "() throw();"; + H << sp; + + + if(!p->isLocal()) + { + string initName = p->flattenedScope() + p->name() + "_init"; + + C << sp << nl << "namespace"; + C << nl << "{"; + + C << sp << nl << "const ::IceInternal::DefaultUserExceptionFactoryInit< " << scoped << "> " + << initName << "(\"" << p->scoped() << "\");"; + + C << sp << nl << "}"; + } + + if(p->isLocal()) + { + C << sp << nl << scoped.substr(2) << "::" << name << spar << "const char* __file" << "int __line" << epar + << " :"; + C.inc(); + emitUpcall(base, "(__file, __line)", true); + if(p->hasDefaultValues()) + { + C << ", "; + writeDataMemberInitializers(C, dataMembers, _useWstring); + } + C.dec(); + C << sb; + C << eb; + } + else if(hasDefaultValues) + { + C << sp << nl << scoped.substr(2) << "::" << name << "() :"; + C.inc(); + writeDataMemberInitializers(C, dataMembers, _useWstring); + C.dec(); + C << sb; + C << eb; + } + + if(!allTypes.empty()) + { + C << sp << nl; + C << scoped.substr(2) << "::" << name << spar; + if(p->isLocal()) + { + C << "const char* __file" << "int __line"; + } + C << allParamDecls << epar; + if(p->isLocal() || !baseParams.empty() || !params.empty()) + { + C << " :"; + C.inc(); + string upcall; + if(!allParamDecls.empty()) + { + upcall = "("; + if(p->isLocal()) + { + upcall += "__file, __line"; + } + for(vector::const_iterator pi = baseParams.begin(); pi != baseParams.end(); ++pi) + { + if(p->isLocal() || pi != baseParams.begin()) + { + upcall += ", "; + } + upcall += *pi; + } + upcall += ")"; + } + if(!params.empty()) + { + upcall += ","; + } + emitUpcall(base, upcall, p->isLocal()); + } + for(vector::const_iterator pi = params.begin(); pi != params.end(); ++pi) + { + if(pi != params.begin()) + { + C << ","; + } + C << nl << *pi << "(__ice_" << *pi << ')'; + } + if(p->isLocal() || !baseParams.empty() || !params.empty()) + { + C.dec(); + } + C << sb; + C << eb; + } + + C << sp << nl; + C << scoped.substr(2) << "::~" << name << "() throw()"; + C << sb; + C << eb; + + H << nl << "virtual ::std::string ice_name() const;"; + C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::ice_name() const"; + C << sb; + C << nl << "return \"" << p->scoped().substr(2) << "\";"; + C << eb; + + StringList metaData = p->getMetaData(); + if(find(metaData.begin(), metaData.end(), "cpp:ice_print") != metaData.end()) + { + H << nl << "virtual void ice_print(::std::ostream&) const;"; + } + + H << nl << "virtual " << name << "* ice_clone() const;"; + C << sp << nl << scoped.substr(2) << "*" << nl << scoped.substr(2) << "::ice_clone() const"; + C << sb; + C << nl << "return new " << name << "(*this);"; + C << eb; + + H << nl << "virtual void ice_throw() const;"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::ice_throw() const"; + C << sb; + C << nl << "throw *this;"; + C << eb; + + if(!p->isLocal() && p->usesClasses(false)) + { + if(!base || (base && !base->usesClasses(false))) + { + H << sp << nl << "virtual bool __usesClasses() const;"; + + C << sp << nl << "bool"; + C << nl << scoped.substr(2) << "::__usesClasses() const"; + C << sb; + C << nl << "return true;"; + C << eb; + } + } + + if(!dataMembers.empty()) + { + H << sp; + } + return true; +} + +void +Slice::Gen::Cpp11TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) +{ + string name = fixKwd(p->name()); + string scope = fixKwd(p->scope()); + string scoped = fixKwd(p->scoped()); + string factoryName; + + if(!p->isLocal()) + { + ExceptionPtr base = p->base(); + bool basePreserved = p->inheritsMetaData("preserve-slice"); + bool preserved = p->hasMetaData("preserve-slice"); + + if(preserved && !basePreserved) + { + H << sp << nl << "virtual void __write(::IceInternal::BasicStream*) const;"; + H << nl << "virtual void __read(::IceInternal::BasicStream*);"; + + if(_stream) + { + H << nl << "virtual void __write(const ::Ice::OutputStreamPtr&) const;"; + H << nl << "virtual void __read(const ::Ice::InputStreamPtr&);"; + } + else + { + string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); + H << nl << "using " << baseName << "::__write;"; + H << nl << "using " << baseName << "::__read;"; + } + } + + H.dec(); + H << sp << nl << "protected:"; + H.inc(); + + H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;"; + H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);"; + + if(_stream) + { + H << nl << "virtual void __writeImpl(const ::Ice::OutputStreamPtr&) const;"; + H << nl << "virtual void __readImpl(const ::Ice::InputStreamPtr&);"; + } + else + { + string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); + H << nl << "using " << baseName << "::__writeImpl;"; + H << nl << "using " << baseName << "::__readImpl;"; + } + + if(preserved && !basePreserved) + { + + H << sp << nl << "::Ice::SlicedDataPtr __slicedData;"; + + C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const"; + C << sb; + C << nl << "__os->startWriteException(__slicedData);"; + C << nl << "__writeImpl(__os);"; + C << nl << "__os->endWriteException();"; + C << eb; + + C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)"; + C << sb; + C << nl << "__is->startReadException();"; + C << nl << "__readImpl(__is);"; + C << nl << "__slicedData = __is->endReadException(true);"; + C << eb; + } + + C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::IceInternal::BasicStream* __os) const"; + C << sb; + C << nl << "__os->startWriteSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");"; + writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); + C << nl << "__os->endWriteSlice();"; + if(base) + { + emitUpcall(base, "::__writeImpl(__os);"); + } + C << eb; + + C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)"; + C << sb; + C << nl << "__is->startReadSlice();"; + writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); + C << nl << "__is->endReadSlice();"; + if(base) + { + emitUpcall(base, "::__readImpl(__is);"); + } + C << eb; + + if(_stream) + { + if(preserved && !basePreserved) + { + C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(const ::Ice::OutputStreamPtr& __os) const"; + C << sb; + C << nl << "__os->startException(__slicedData);"; + C << nl << "__writeImpl(__os);"; + C << nl << "__os->endException();"; + C << eb; + + C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __is)"; + C << sb; + C << nl << "__is->startException();"; + C << nl << "__readImpl(__is);"; + C << nl << "__slicedData = __is->endException(true);"; + C << eb; + } + + C << sp << nl << "void" << nl << scoped.substr(2) + << "::__writeImpl(const ::Ice::OutputStreamPtr& __os) const"; + C << sb; + C << nl << "__os->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");"; + writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); + C << nl << "__os->endSlice();"; + if(base) + { + emitUpcall(base, "::__writeImpl(__os);"); + } + C << eb; + + C << sp << nl << "void" << nl << scoped.substr(2) + << "::__readImpl(const ::Ice::InputStreamPtr& __is)"; + C << sb; + C << nl << "__is->startSlice();"; + writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); + C << nl << "__is->endSlice();"; + if(base) + { + emitUpcall(base, "::__readImpl(__is);"); + } + C << eb; + } + } + H << eb << ';'; + + if(!p->isLocal()) + { + // + // We need an instance here to trigger initialization if the implementation is in a shared libarry. + // But we do this only once per source file, because a single instance is sufficient to initialize + // all of the globals in a shared library. + // + if(!_doneStaticSymbol) + { + _doneStaticSymbol = true; + H << sp << nl << "static " << name << " __" << p->name() << "_init;"; + } + } + + _useWstring = resetUseWstring(_useWstringHist); +} + +bool +Slice::Gen::Cpp11TypesVisitor::visitStructStart(const StructPtr& p) +{ + DataMemberList dataMembers = p->dataMembers(); + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + + string name = fixKwd(p->name()); + + + H << sp << nl << "struct " << name; + H << sb; + + return true; +} + +void +Slice::Gen::Cpp11TypesVisitor::visitStructEnd(const StructPtr& p) +{ + string name = fixKwd(p->name()); + string scoped = fixKwd(p->scoped()); + string scope = fixKwd(p->scope()); + + DataMemberList dataMembers = p->dataMembers(); + + vector params; + vector::const_iterator pi; + + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + params.push_back(fixKwd((*q)->name())); + } + + bool containsSequence = false; + if((Dictionary::legalKeyType(p, containsSequence) && !containsSequence)) + { + H << sp << nl << "bool operator==(const " << name << "& __rhs) const"; + H << sb; + H << nl << "if(this == &__rhs)"; + H << sb; + H << nl << "return true;"; + H << eb; + for(vector::const_iterator pi = params.begin(); pi != params.end(); ++pi) + { + H << nl << "if(" << *pi << " != __rhs." << *pi << ')'; + H << sb; + H << nl << "return false;"; + H << eb; + } + H << nl << "return true;"; + H << eb; + H << sp << nl << "bool operator<(const " << name << "& __rhs) const"; + H << sb; + H << nl << "if(this == &__rhs)"; + H << sb; + H << nl << "return false;"; + H << eb; + for(vector::const_iterator pi = params.begin(); pi != params.end(); ++pi) + { + H << nl << "if(" << *pi << " < __rhs." << *pi << ')'; + H << sb; + H << nl << "return true;"; + H << eb; + H << nl << "else if(__rhs." << *pi << " < " << *pi << ')'; + H << sb; + H << nl << "return false;"; + H << eb; + } + H << nl << "return false;"; + H << eb; + + H << sp << nl << "bool operator!=(const " << name << "& __rhs) const"; + H << sb; + H << nl << "return !operator==(__rhs);"; + H << eb; + H << nl << "bool operator<=(const " << name << "& __rhs) const"; + H << sb; + H << nl << "return operator<(__rhs) || operator==(__rhs);"; + H << eb; + H << nl << "bool operator>(const " << name << "& __rhs) const"; + H << sb; + H << nl << "return !operator<(__rhs) && !operator==(__rhs);"; + H << eb; + H << nl << "bool operator>=(const " << name << "& __rhs) const"; + H << sb; + H << nl << "return !operator<(__rhs);"; + H << eb; + } + H << eb << ';'; + _useWstring = resetUseWstring(_useWstringHist); +} + +void +Slice::Gen::Cpp11TypesVisitor::visitDataMember(const DataMemberPtr& p) +{ + string name = fixKwd(p->name()); + H << nl << typeToString(p->type(), p->optional(), p->getMetaData(), _useWstring, true) << ' ' << name; + + string defaultValue = p->defaultValue(); + if(!defaultValue.empty()) + { + H << " = "; + writeConstantValue(H, p->type(), p->defaultValueType(), defaultValue, _useWstring, p->getMetaData(), true); + } + + H << ';'; +} + +void +Slice::Gen::Cpp11TypesVisitor::visitSequence(const SequencePtr& p) +{ + string name = fixKwd(p->name()); + TypePtr type = p->type(); + string s = typeToString(type, p->typeMetaData(), _useWstring, true); + StringList metaData = p->getMetaData(); + + string seqType = findMetaData(metaData, _useWstring); + H << sp; + + if(!seqType.empty()) + { + H << nl << "typedef " << seqType << ' ' << name << ';'; + } + else + { + H << nl << "typedef ::std::vector<" << (s[0] == ':' ? " " : "") << s << "> " << name << ';'; + } +} + +void +Slice::Gen::Cpp11TypesVisitor::visitDictionary(const DictionaryPtr& p) +{ + string name = fixKwd(p->name()); + string dictType = findMetaData(p->getMetaData()); + + if(dictType.empty()) + { + // + // A default std::map dictionary + // + + TypePtr keyType = p->keyType(); + TypePtr valueType = p->valueType(); + string ks = typeToString(keyType, p->keyMetaData(), _useWstring); + if(ks[0] == ':') + { + ks.insert(0, " "); + } + string vs = typeToString(valueType, p->valueMetaData(), _useWstring); + + H << sp << nl << "typedef ::std::map<" << ks << ", " << vs << "> " << name << ';'; + } + else + { + // + // A custom dictionary + // + H << sp << nl << "typedef " << dictType << ' ' << name << ';'; + } +} + +Slice::Gen::Cpp11ProxyDeclVisitor::Cpp11ProxyDeclVisitor(Output& h, Output&, const string& dllExport) : + H(h), _dllExport(dllExport) +{ +} + +bool +Slice::Gen::Cpp11ProxyDeclVisitor::visitUnitStart(const UnitPtr& p) +{ + if(!p->hasNonLocalClassDecls()) + { + return false; + } + return true; +} + +void +Slice::Gen::Cpp11ProxyDeclVisitor::visitUnitEnd(const UnitPtr&) +{ +} + +bool +Slice::Gen::Cpp11ProxyDeclVisitor::visitModuleStart(const ModulePtr& p) +{ + if(!p->hasNonLocalClassDecls()) + { + return false; + } + H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{'; + return true; +} + +void +Slice::Gen::Cpp11ProxyDeclVisitor::visitModuleEnd(const ModulePtr&) +{ + H << sp << nl << '}'; +} + +void +Slice::Gen::Cpp11ProxyDeclVisitor::visitClassDecl(const ClassDeclPtr& p) +{ + if(!p->isLocal()) + { + string name = fixKwd(p->name()); + string scoped = fixKwd(p->scoped()); + + ClassDefPtr def = p->definition(); + if(p->isInterface() || (def && !def->allOperations().empty())) + { + H << nl << "class " << p->name() << "Prx;"; + H << nl << "typedef ::std::shared_ptr<" << p->name() << "Prx> " << p->name() << "PrxPtr;"; + } + } +} + + +Slice::Gen::Cpp11ProxyVisitor::Cpp11ProxyVisitor(Output& h, Output& c, const string& dllExport) : + H(h), C(c), _dllExport(dllExport), _useWstring(false) +{ +} + +bool +Slice::Gen::Cpp11ProxyVisitor::visitUnitStart(const UnitPtr& p) +{ + return true; +} + +void +Slice::Gen::Cpp11ProxyVisitor::visitUnitEnd(const UnitPtr&) +{ +} + +bool +Slice::Gen::Cpp11ProxyVisitor::visitModuleStart(const ModulePtr& p) +{ + if(!p->hasNonLocalClassDefs()) + { + return false; + } + + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + + string name = fixKwd(p->name()); + + H << sp << nl << "namespace " << name << nl << '{'; + + return true; +} + +void +Slice::Gen::Cpp11ProxyVisitor::visitModuleEnd(const ModulePtr&) +{ + H << sp << nl << '}'; + + _useWstring = resetUseWstring(_useWstringHist); +} + +bool +Slice::Gen::Cpp11ProxyVisitor::visitClassDefStart(const ClassDefPtr& p) +{ + if(p->isLocal() || (!p->isInterface() && p->allOperations().empty())) + { + return false; + } + + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + + string name = fixKwd(p->name()); + string scope = fixKwd(p->scope()); + string scoped = fixKwd(p->scoped()); + ClassList bases = p->bases(); + + ClassDefPtr base; + if(!bases.empty() && !bases.front()->isInterface()) + { + base = bases.front(); + } + + H << sp << nl << "class " << _dllExport << p->name() << "Prx : "; + if(bases.empty() || (base && base->allOperations().empty())) + { + H << "virtual public ::Ice::ObjectPrx"; + } + else + { + H.useCurrentPosAsIndent(); + ClassList::const_iterator q = bases.begin(); + while(q != bases.end()) + { + H << "virtual public " << fixKwd((*q)->scoped() + "Prx"); + if(++q != bases.end()) + { + H << ',' << nl; + } + } + H.restoreIndent(); + } + + H << sb; + H.dec(); + H << nl << "public:"; + H.inc(); + return true; +} + +void +Slice::Gen::Cpp11ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p) +{ + // + // "Overwrite" various non-virtual functions in ::IceProxy::Ice::Object that return an ObjectPrx and + // are more usable when they return a Prx + // + + // + // No identity! + // + + string prx = fixKwd(p->name() + "Prx"); + + H << nl << "::std::shared_ptr<" << prx << "> ice_context(const ::Ice::Context& __context) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(Ice::ObjectPrx::ice_context(__context));"; + H << eb; + + // + // No facet! + // + + H << nl << "::std::shared_ptr<" << prx << "> ice_adapterId(const ::std::string& __id) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_adapterId(__id));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_endpoints(__endpoints));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_locatorCacheTimeout(int __timeout) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_locatorCacheTimeout(__timeout));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_connectionCached(bool __cached) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_connectionCached(__cached));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_endpointSelection(::Ice::EndpointSelectionType __est) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_endpointSelection(__est));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_secure(bool __secure) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_secure(__secure));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_preferSecure(bool __preferSecure) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_preferSecure(__preferSecure));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_router(const ::Ice::RouterPrxPtr& __router) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_router(__router));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_locator(const ::Ice::LocatorPrxPtr& __locator) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_locator(__locator));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_collocationOptimized(bool __co) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_collocationOptimized(__co));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_invocationTimeout(int __timeout) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_invocationTimeout(__timeout));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_twoway() const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_twoway());"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_oneway() const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_oneway());"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_batchOneway() const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_batchOneway());"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_datagram() const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_datagram());"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_batchDatagram() const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_batchDatagram());"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_compress(bool __compress) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_compress(__compress));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_timeout(int __timeout) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_timeout(__timeout));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_connectionId(const ::std::string& __id) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_connectionId(__id));"; + H << eb; + + H << nl << "::std::shared_ptr<" << prx << "> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const"; + H << sb; + H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_encodingVersion(__v));"; + H << eb; + + + H << sp; + H << nl << "static const ::std::string& ice_staticId();"; + + H.dec(); + H << sp << nl << "private: "; + H.inc(); + H << nl << "virtual ::std::shared_ptr<::Ice::ObjectPrx> __newInstance() const;"; + + H << eb << ';'; + + string suffix = p->isInterface() ? "" : "Disp"; + + + string scoped = fixKwd(p->scoped() + "Prx"); + + C << sp; + C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()"; + C << sb; + C << nl << "return "<< fixKwd(p->scope() + p->name() + suffix).substr(2) << "::ice_staticId();"; + C << eb; + + C << sp << nl << "::std::shared_ptr<::Ice::ObjectPrx>"; + C << nl << scoped.substr(2) << "::__newInstance() const"; + C << sb; + C << nl << "return ::std::make_shared<" << prx << ">();"; + C << eb; + + _useWstring = resetUseWstring(_useWstringHist); +} + +void +Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) +{ + string name = p->name(); + string flatName = p->flattenedScope() + p->name() + "_name"; + + TypePtr ret = p->returnType(); + + bool retIsOpt = p->returnIsOptional(); + string retS = returnTypeToString(ret, retIsOpt, p->getMetaData(), _useWstring | TypeContextAMIEnd, true); + + ContainerPtr container = p->container(); + ClassDefPtr cl = ClassDefPtr::dynamicCast(container); + + vector params; + vector paramsDecl; + + vector lambdaParams; + vector lambdaParamsDecl; + + vector futureParamsDecl; + + vector lambdaOutParams; + vector lambdaOutParamsDecl; + + ParamDeclList paramList = p->parameters(); + ParamDeclList inParams; + ParamDeclList outParams; + + string returnValueS = "returnValue"; + + for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) + { + string paramName = fixKwd(paramPrefix + (*q)->name()); + + StringList metaData = (*q)->getMetaData(); + string typeString; + string outputTypeString; + string typeStringEndAMI; + if((*q)->isOutParam()) + { + typeString = typeToString((*q)->type(), (*q)->optional(), metaData, _useWstring, true); + outputTypeString = outputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring, true); + } + else + { + typeString = inputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring, true); + } + + + if(!(*q)->isOutParam()) + { + params.push_back(typeString); + paramsDecl.push_back(typeString + ' ' + paramName); + + lambdaParams.push_back(typeString); + lambdaParamsDecl.push_back(typeString + ' ' + paramName); + + futureParamsDecl.push_back(typeString + ' ' + paramName); + + inParams.push_back(*q); + } + else + { + params.push_back(outputTypeString); + paramsDecl.push_back(outputTypeString + ' ' + paramName); + + lambdaOutParams.push_back(typeString); + lambdaOutParamsDecl.push_back(typeString + ' ' + paramName); + + outParams.push_back(*q); + if((*q)->name() == "returnValue") + { + returnValueS = "_returnValue"; + } + } + } + + string scoped = fixKwd(cl->scope() + cl->name() + "Prx" + "::").substr(2); + + string deprecateSymbol = getDeprecateSymbol(p, cl); + H << sp << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl + << "const ::Ice::Context& __ctx = Ice::noExplicitContext" << epar << ";"; + + C << sp; + C << nl << retS; + C << nl << scoped << fixKwd(p->name()) << spar << paramsDecl << "const ::Ice::Context& __ctx" << epar; + C << sb; + C << nl << "::std::promise<" << retS << "> __promise;"; + if(!p->returnsData()) + { + C << nl << "if(ice_isTwoway())"; + C << sb; + } + + C << nl << name << "_async("; + C.useCurrentPosAsIndent(); + for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();) + { + C << fixKwd(paramPrefix + (*q)->name()) << ","; + if(++q != inParams.end()) + { + C << " "; + } + } + if(!inParams.empty()) + { + C << nl; + } + C << "[&]("; + if(retS != "void") + { + C << retS << " __ret"; + } + if(!outParams.empty()) + { + if(retS != "void") + { + C << ", "; + } + for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end();) + { + C << typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true) + << " " << "__o_" << (*q)->name(); + if(++q != outParams.end()) + { + C << ","; + } + } + } + C << ")"; + C << sb; + if(!outParams.empty()) + { + for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q) + { + C << nl << paramPrefix << (*q)->name() << " = "; + bool movable = isMovable((*q)->type()); + if(movable) + { + C << "::std::move("; + } + C << "__o_" << (*q)->name(); + if(movable) + { + C << ")"; + } + C << ";"; + } + } + C << nl << "__promise.set_value("; + if(retS != "void") + { + C << (isMovable(ret) ? "::std::move(__ret)" : "__ret"); + } + C << ");"; + C << eb << ","; + C << nl << "[&](::std::exception_ptr __ex)"; + C << sb; + C << nl << "__promise.set_exception(::std::move(__ex));"; + C << eb << ","; + C << nl << "nullptr, __ctx);"; + C.restoreIndent(); + C << nl; + if(retS != "void") + { + C << "return "; + } + C << "__promise.get_future().get();"; + + if(!p->returnsData()) + { + C << eb; + C << nl << "else if(ice_isOneway() || ice_isDatagram())"; + C << sb; + + C << nl << name << "_async("; + C.useCurrentPosAsIndent(); + for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();) + { + C << fixKwd(paramPrefix + (*q)->name()) << ","; + if(++q != inParams.end()) + { + C << " "; + } + } + if(!inParams.empty()) + { + C << nl; + } + C << "nullptr,"; + C << nl << "[&](::std::exception_ptr __ex)"; + C << sb; + C << nl << "__promise.set_exception(::std::move(__ex));"; + C << eb << ","; + C << nl << "[&](bool)"; + C << sb; + C << nl << "__promise.set_value();"; + C << eb << ","; + C << nl << "__ctx);"; + C.restoreIndent(); + C << nl << "__promise.get_future().get();"; + + C << eb; + C << nl << "else"; + C << sb; + C << nl << name << "_async("; + for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q) + { + C << fixKwd(paramPrefix + (*q)->name()) << ","; + } + C << " nullptr, nullptr, nullptr, __ctx);"; + C << nl << "__promise.set_value();"; + C << eb; + } + + C << eb; + + H << sp; + H << nl << "::std::function"; + H << nl << name << "_async("; + H.useCurrentPosAsIndent(); + for(vector::const_iterator i = lambdaParams.begin(); i != lambdaParams.end();) + { + H << *i << ","; + if(++i != lambdaParams.end()) + { + H << " "; + } + } + if(!lambdaParams.empty()) + { + H << nl; + } + H << "::std::function::const_iterator i = lambdaOutParams.begin(); i != lambdaOutParams.end();) + { + H << (*i); + if(++i != lambdaOutParams.end()) + { + H << ", "; + } + } + H << ")>,"; + H << nl << "::std::function __exception = nullptr," + << nl << "::std::function __sent = nullptr," + << nl << "const ::Ice::Context& __ctx = Ice::noExplicitContext);"; + H.restoreIndent(); + + C << sp; + C << nl << "::std::function"; + C << nl << scoped << fixKwd(p->name() + "_async") << "("; + C.useCurrentPosAsIndent(); + for(vector::const_iterator i = lambdaParamsDecl.begin(); i != lambdaParamsDecl.end();) + { + C << *i << ","; + if(++i != lambdaParamsDecl.end()) + { + C << " "; + } + } + if(!lambdaParamsDecl.empty()) + { + C << nl; + } + C << "::std::function::const_iterator i = lambdaOutParams.begin(); i != lambdaOutParams.end();) + { + C << (*i); + if(++i != lambdaOutParams.end()) + { + C << ", "; + } + } + C << ")> __response,"; + C << nl << "::std::function __exception," + << nl << "::std::function __sent," + << nl << "const ::Ice::Context& __ctx)"; + C.restoreIndent(); + C << sb; + C << nl << "return ::IceInternal::" << (p->returnsData() ? "Twoway" : "Oneway") << "ClosureCallback::invoke("; + C.inc(); + C << nl << flatName << ", shared_from_this(), " + << operationModeToString(p->sendMode(), true) << ", " + << opFormatTypeToString(p) << ","; + if(inParams.empty()) + { + C << " nullptr,"; + } + else + { + C << nl << "[&](::IceInternal::BasicStream* __os)"; + C << sb; + writeMarshalCode(C, inParams, 0, true, TypeContextInParam); + if(p->sendsClasses(false)) + { + C << nl << "__os->writePendingObjects();"; + } + C << eb << ","; + } + + if(p->returnsData()) + { + if(ret || !outParams.empty()) + { + C << nl << "false" << ","; + C << nl << "[__response = ::std::move(__response)](::IceInternal::BasicStream* __is)"; + C << sb; + writeAllocateCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd | TypeContextReadClosure, true); + writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd); + if(p->returnsClasses(false)) + { + C << nl << "__is->readPendingObjects();"; + } + C << nl << "__is->endReadEncaps();"; + C << nl << "if(__response)"; + C << sb; + C << nl << "try"; + C << sb; + C << nl << "__response("; + if(ret) + { + C << (isMovable(ret) ? "::std::move(__ret)" : "__ret"); + if(!outParams.empty()) + { + C << ", "; + } + } + for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end();) + { + string p = fixKwd(paramPrefix + (*q)->name()); + C << (isMovable((*q)->type()) ? ("::std::move(" + p + ")") : p); + if(++q != outParams.end()) + { + C << ","; + } + } + C << ");"; + C << eb; + C << nl << "catch(...)"; + C << sb; + C << nl << "throw std::current_exception();"; + C << eb; + C << eb; + C << eb << ","; + } + else + { + C << nl << "true" << ","; + C << nl << "[__response](::IceInternal::BasicStream*)"; + C << sb; + C << nl << "if(__response)"; + C << sb; + C << nl << "try"; + C << sb; + C << nl << "__response();"; + C << eb; + C << nl << "catch(...)"; + C << sb; + C << nl << "throw std::current_exception();"; + C << eb; + C << eb; + C << eb << ","; + } + + ExceptionList throws = p->throws(); + if(!throws.empty()) + { + throws.sort(); + throws.unique(); + + // + // Arrange exceptions into most-derived to least-derived order. If we don't + // do this, a base exception handler can appear before a derived exception + // handler, causing compiler warnings and resulting in the base exception + // being marshaled instead of the derived exception. + // + +#if defined(__SUNPRO_CC) + throws.sort(derivedToBaseCompare); +#else + throws.sort(Slice::DerivedToBaseCompare()); +#endif + C << nl << "[](const ::Ice::UserException& __ex)"; + C << sb; + C << nl << "try"; + C << sb; + C << nl << "__ex.ice_throw();"; + C << eb; + // + // Generate a catch block for each legal user exception. + // + for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i) + { + string scoped = (*i)->scoped(); + C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)"; + C << sb; + C << nl << "throw;"; + C << eb; + } + C << nl << "catch(const ::Ice::UserException&)"; + C << sb; + C << eb; + C << eb << ","; + } + else + { + C << nl << "nullptr, "; + } + } + else + { + C << nl << "__response,"; + } + C << nl << "::std::move(__exception), ::std::move(__sent), __ctx);"; + C.dec(); + C << eb; + + string futureT; + + if(retS == "void" && outParams.empty()) + { + futureT = "void"; + } + else if(outParams.empty()) + { + futureT = retS; + } + else if(retS == "void" && outParams.size() == 1) + { + ParamDeclPtr param = outParams.front(); + futureT = typeToString(param->type(), param->optional(), param->getMetaData(), _useWstring, true); + } + else + { + futureT = "Result_" + name; + } + + if(futureT.find("Result_") == 0) + { + // We need to generate a Result_ struct. + H << sp; + H << nl << "struct Result_" << name; + H << sb; + if(retS != "void") + { + H << nl << retS << " " << returnValueS << ";"; + } + for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q) + { + H << nl << typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true) + << " " << (*q)->name() << ";"; + } + H << eb << ";"; + } + + H << sp; + H << nl << "template class P = ::std::promise>"; + H << nl << deprecateSymbol << "auto " << name << "_async" << spar << futureParamsDecl + << "const ::Ice::Context& __ctx = Ice::noExplicitContext" << epar; + H.inc(); + H << nl << "-> decltype(::std::declval>().get_future())"; + H.dec(); + H << sb; + H << nl << "using Promise = P<" << futureT << ">;"; + H << nl << "auto __promise = ::std::make_shared();"; + if(!p->returnsData()) + { + H << nl << "if(ice_isTwoway())"; + H << sb; + } + H << nl << name << "_async("; + H.useCurrentPosAsIndent(); + for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();) + { + H << fixKwd(paramPrefix + (*q)->name()) << ","; + if(++q != inParams.end()) + { + H << " "; + } + } + if(!inParams.empty()) + { + H << nl; + } + H << "[__promise]("; + + if(retS != "void") + { + H << retS << " __ret"; + if(!lambdaOutParams.empty()) + { + H << ", "; + } + } + for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end();) + { + H << typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true) + << " " << paramPrefix << (*q)->name(); + if(++q != outParams.end()) + { + H << ","; + } + } + H << ")"; + H << sb; + if(retS == "void" && outParams.empty()) + { + H << nl << "__promise->set_value();"; + } + else if(outParams.empty()) + { + H << nl << "__promise->set_value(" << (isMovable(ret) ? "::std::move(__ret)" : "__ret") << ");"; + } + else if(retS == "void" && outParams.size() == 1) + { + H << nl << "__promise->set_value(" << paramPrefix << outParams.front()->name() << ");"; + } + else + { + H << nl << "Result_" << name << " __result;"; + if(retS != "void") + { + H << nl << "__result." << returnValueS << " = " << (isMovable(ret) ? "::std::move(__ret)" : "__ret") << ";"; + } + for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q) + { + H << nl << "__result." << (*q)->name() << " = " + << (isMovable((*q)->type()) ? ("::std::move(" + paramPrefix + (*q)->name() + ")") : (paramPrefix + (*q)->name())) + << ";"; + } + H << nl << "__promise->set_value(::std::move(__result));"; + } + + H << eb << ","; + H << nl << "[__promise](::std::exception_ptr __ex)"; + H << sb; + H << nl << "__promise->set_exception(::std::move(__ex));"; + H << eb << ","; + H << nl << "nullptr, __ctx);"; + H.restoreIndent(); + + if(!p->returnsData()) + { + H << eb; + H << nl << "else if(ice_isOneway() || ice_isDatagram())"; + H << sb; + + H << nl << name << "_async("; + H.useCurrentPosAsIndent(); + for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();) + { + H << fixKwd(paramPrefix + (*q)->name()) << ","; + if(++q != inParams.end()) + { + H << " "; + } + } + H << nl << "nullptr,"; + H << nl << "[__promise](::std::exception_ptr __ex)"; + H << sb; + H << nl << "__promise->set_exception(::std::move(__ex));"; + H << eb << ","; + H << nl << "[__promise](bool)"; + H << sb; + H << nl << "__promise->set_value();"; + H << eb << ","; + H << nl << "__ctx);"; + H.restoreIndent(); + + H << eb; + H << nl << "else"; + H << sb; + H << nl << name << "_async("; + for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q) + { + H << fixKwd(paramPrefix + (*q)->name()) << ","; + } + H << "nullptr, nullptr, nullptr, __ctx);"; + H << eb; + } + + H << nl << "return __promise->get_future();"; + H << eb; +} + + +namespace +{ + +string +enumSizeType(IceUtil::Int64 size) +{ + if(size <= 0xFF) + { + return "char"; + } + else if(size <= 0xFFFF) + { + return "short"; + } + else if(size <= 0xFFFFFFFF) + { + return "int"; + } + else + { + return "long long int"; + } +} + +}; + +void +Slice::Gen::Cpp11TypesVisitor::visitEnum(const EnumPtr& p) +{ + bool unscoped = findMetaData(p->getMetaData()) == "%unscoped"; + H << sp << nl << "enum "; + if(!unscoped) + { + H << "class "; + } + H << fixKwd(p->name()); + if(!unscoped) + { + H << " : " << enumSizeType(p->maxValue()); + } + H << sb; + + EnumeratorList enumerators = p->getEnumerators(); + // + // Check if any of the enumerators were assigned an explicit value. + // + const bool explicitValue = p->explicitValue(); + for(EnumeratorList::const_iterator en = enumerators.begin(); en != enumerators.end();) + { + H << nl << fixKwd((*en)->name()); + // + // If any of the enumerators were assigned an explicit value, we emit + // an explicit value for *all* enumerators. + // + if(explicitValue) + { + H << " = " << int64ToString((*en)->value()); + } + if(++en != enumerators.end()) + { + H << ','; + } + } + H << eb << ';'; +} + +void +Slice::Gen::Cpp11TypesVisitor::visitConst(const ConstPtr& p) +{ + H << sp; + H << nl << (isConstexprType(p->type()) ? "constexpr " : "const ") << typeToString(p->type(), p->typeMetaData(), _useWstring, true) << " " << fixKwd(p->name()) + << " = "; + writeConstantValue(H, p->type(), p->valueType(), p->value(), _useWstring, p->typeMetaData(), true); + H << ';'; +} + +void +Slice::Gen::Cpp11TypesVisitor::emitUpcall(const ExceptionPtr& base, const string& call, bool isLocal) +{ + C << nl << (base ? fixKwd(base->scoped()) : string(isLocal ? "::Ice::LocalException" : "::Ice::UserException")) + << call; +} + +Slice::Gen::Cpp11ObjectVisitor::Cpp11ObjectVisitor(::IceUtilInternal::Output& h, + ::IceUtilInternal::Output& c, + const std::string& dllExport, + bool stream) : + H(h), + C(c), + _dllExport(dllExport), + _stream(stream), + _doneStaticSymbol(false), + _useWstring(false) +{ +} + +void +Slice::Gen::Cpp11ObjectVisitor::emitDataMember(const DataMemberPtr& p) +{ + string name = fixKwd(p->name()); + H << sp << nl << typeToString(p->type(), p->optional(), p->getMetaData(), _useWstring, true) << ' ' << name << ';'; +} + +void +Slice::Gen::Cpp11InterfaceVisitor::emitUpcall(const ClassDefPtr& base, const string& call) +{ + C << nl << (base ? fixKwd(base->scoped()) : string("::Ice::Object")) << call; +} + +void +Slice::Gen::Cpp11ValueVisitor::emitUpcall(const ClassDefPtr& base, const string& call) +{ + C << nl << (base ? fixKwd(base->scoped()) : string("::Ice::Value")) << call; +} + +Slice::Gen::Cpp11LocalObjectVisitor::Cpp11LocalObjectVisitor(::IceUtilInternal::Output& h, + ::IceUtilInternal::Output& c, + const std::string& dllExport, + bool stream) : + Cpp11ObjectVisitor(h, c, dllExport, stream) +{ +} + +bool +Slice::Gen::Cpp11LocalObjectVisitor::visitModuleStart(const ModulePtr& p) +{ + if(!p->hasLocalClassDefs()) + { + return false; + } + + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + string name = fixKwd(p->name()); + H << sp << nl << "namespace " << name << nl << '{'; + return true; +} + +void +Slice::Gen::Cpp11LocalObjectVisitor::visitModuleEnd(const ModulePtr&) +{ + H << sp; + H << nl << '}'; + _useWstring = resetUseWstring(_useWstringHist); +} + +bool +Slice::Gen::Cpp11LocalObjectVisitor::visitClassDefStart(const ClassDefPtr& p) +{ + if(!p->isLocal()) + { + return false; + } + string t; + if(findMetaData("cpp11:type:", p->getMetaData(), t)) + { + H << sp << "typedef " << t << " " << fixKwd(p->name()) << ";"; + return false; + } + string name = fixKwd(p->name()); + string scope = fixKwd(p->scope()); + string scoped = fixKwd(p->scoped()); + ClassList bases = p->bases(); + ClassDefPtr base; + if(!bases.empty() && !bases.front()->isInterface()) + { + base = bases.front(); + } + DataMemberList dataMembers = p->dataMembers(); + DataMemberList allDataMembers = p->allDataMembers(); + + H << sp << nl << "class " << _dllExport << name; + H.useCurrentPosAsIndent(); + if(!bases.empty()) + { + H << " : "; + ClassList::const_iterator q = bases.begin(); + bool virtualInheritance = p->isInterface(); + while(q != bases.end()) + { + if(virtualInheritance || (*q)->isInterface()) + { + H << "virtual "; + } + + H << "public " << fixKwd((*q)->scoped()); + if(++q != bases.end()) + { + H << ',' << nl; + } + } + } + + H.restoreIndent(); + H << sb; + H.dec(); + H << nl << "public:" << sp; + H.inc(); + + // + // In C++, a nested type cannot have the same name as the enclosing type + // + if(p->name() != "PointerType") + { + H << nl << "typedef " << p->name() << "Ptr PointerType;"; + } + + vector params; + vector allTypes; + vector allParamDecls; + + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + params.push_back(fixKwd((*q)->name())); + } + + for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q) + { + string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring); + allTypes.push_back(typeName); + allParamDecls.push_back(typeName + " __ice_" + (*q)->name()); + } + + if(!p->isInterface()) + { + if(p->hasDefaultValues()) + { + H << sp << nl << name << "() :"; + H.inc(); + writeDataMemberInitializers(H, dataMembers, _useWstring); + H.dec(); + H << sb; + H << eb; + } + else + { + H << sp << nl << name << "()"; + H << sb << eb; + } + + emitOneShotConstructor(p); + H << sp; + } + return true; +} + +void +Slice::Gen::Cpp11LocalObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) +{ + string scoped = fixKwd(p->scoped()); + string scope = fixKwd(p->scope()); + ClassList bases = p->bases(); + ClassDefPtr base; + if(!bases.empty() && !bases.front()->isInterface()) + { + base = bases.front(); + } + + // + // Emit data members. Access visibility may be specified by metadata. + // + bool inProtected = true; + DataMemberList dataMembers = p->dataMembers(); + bool prot = p->hasMetaData("protected"); + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + if(prot || (*q)->hasMetaData("protected")) + { + if(!inProtected) + { + H.dec(); + H << sp << nl << "protected:"; + H.inc(); + inProtected = true; + } + } + else + { + if(inProtected) + { + H.dec(); + H << sp << nl << "public:"; + H.inc(); + inProtected = false; + } + } + + emitDataMember(*q); + } + + if(!p->isAbstract()) + { + if(inProtected) + { + H.dec(); + H << sp << nl << "public:"; + H.inc(); + inProtected = false; + } + H << sp << nl << "virtual ~" << fixKwd(p->name()) << "() = default;"; + + if(!_doneStaticSymbol) + { + H << sp << nl << "friend class " << p->name() << "__staticInit;"; + } + } + + H << eb << ';'; + + if(!p->isAbstract() && !_doneStaticSymbol) + { + // + // We need an instance here to trigger initialization if the implementation is in a shared library. + // But we do this only once per source file, because a single instance is sufficient to initialize + // all of the globals in a shared library. + // + // For a Slice class Foo, we instantiate a dummy class Foo__staticInit instead of using a static + // Foo instance directly because Foo has a protected destructor. + // + H << sp << nl << "class " << p->name() << "__staticInit"; + H << sb; + H.dec(); + H << nl << "public:"; + H.inc(); + H << sp << nl << scoped << " _init;"; + H << eb << ';'; + _doneStaticSymbol = true; + H << sp << nl << "static " << p->name() << "__staticInit _" << p->name() << "_init;"; + } +} + +bool +Slice::Gen::Cpp11LocalObjectVisitor::visitExceptionStart(const ExceptionPtr&) +{ + return false; +} + +bool +Slice::Gen::Cpp11LocalObjectVisitor::visitStructStart(const StructPtr&) +{ + return false; +} + +void +Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p) +{ + string name = p->name(); + string scoped = fixKwd(p->scoped()); + string scope = fixKwd(p->scope()); + + TypePtr ret = p->returnType(); + string retS = returnTypeToString(ret, p->returnIsOptional(), p->getMetaData(), _useWstring, true); + + string params = "("; + string paramsDecl = "("; + string args = "("; + + ContainerPtr container = p->container(); + ClassDefPtr cl = ClassDefPtr::dynamicCast(container); + string classScope = fixKwd(cl->scope()); + + ParamDeclList inParams; + ParamDeclList outParams; + ParamDeclList paramList = p->parameters(); + vector< string> outDecls; + for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q) + { + string paramName = fixKwd(string(paramPrefix) + (*q)->name()); + TypePtr type = (*q)->type(); + bool isOutParam = (*q)->isOutParam(); + string typeString; + if(isOutParam) + { + outParams.push_back(*q); + typeString = outputTypeToString(type, (*q)->optional(), (*q)->getMetaData(), _useWstring, true); + } + else + { + inParams.push_back(*q); + typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true); + } + + if(q != paramList.begin()) + { + params += ", "; + paramsDecl += ", "; + args += ", "; + } + + params += typeString; + paramsDecl += typeString; + paramsDecl += ' '; + paramsDecl += paramName; + args += paramName; + + if(isOutParam) + { + outDecls.push_back(inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true)); + } + } + + params += ')'; + paramsDecl += ')'; + args += ')'; + + bool isConst = (p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const"); + + string deprecateSymbol = getDeprecateSymbol(p, cl); + + H << sp; + H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params + << (isConst ? " const" : "") << " = 0;"; + + if(cl->hasMetaData("async") || p->hasMetaData("async")) + { + vector paramsDeclAMI; + vector outParamsDeclAMI; + + ParamDeclList paramList = p->parameters(); + for(ParamDeclList::const_iterator r = paramList.begin(); r != paramList.end(); ++r) + { + string paramName = fixKwd((*r)->name()); + + StringList metaData = (*r)->getMetaData(); + string typeString; + if((*r)->isOutParam()) + { + typeString = outputTypeToString((*r)->type(), (*r)->optional(), metaData, + _useWstring | TypeContextAMIEnd, true); + } + else + { + typeString = inputTypeToString((*r)->type(), (*r)->optional(), metaData, _useWstring, true); + } + + if(!(*r)->isOutParam()) + { + paramsDeclAMI.push_back(typeString + ' ' + paramName); + } + else + { + outParamsDeclAMI.push_back(typeString + ' ' + paramName); + } + } + + H << sp; + H << nl << "virtual ::std::function"; + H << nl << name << "_async("; + H.useCurrentPosAsIndent(); + for(vector::const_iterator i = paramsDeclAMI.begin(); i != paramsDeclAMI.end(); ++i) + { + H << *i << ","; + } + if(!paramsDeclAMI.empty()) + { + H << nl; + } + H << "::std::function::const_iterator i = outParamsDeclAMI.begin(); i != outParamsDeclAMI.end();) + { + H << *i << ","; + if(++i != outParamsDeclAMI.end()) + { + H << " "; + } + } + H << ")>,"; + H << nl << "::std::function exception = nullptr,"; + H << nl << "::std::function sent = nullptr) = 0;"; + H.restoreIndent(); + } +} + +Slice::Gen::Cpp11InterfaceVisitor::Cpp11InterfaceVisitor(::IceUtilInternal::Output& h, + ::IceUtilInternal::Output& c, + const std::string& dllExport, + bool stream) : + Cpp11ObjectVisitor(h, c, dllExport, stream) +{ +} + +bool +Slice::Gen::Cpp11InterfaceVisitor::visitModuleStart(const ModulePtr& p) +{ + if(!p->hasNonLocalInterfaceDefs()) + { + return false; + } + + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + string name = fixKwd(p->name()); + H << sp << nl << "namespace " << name << nl << '{'; + return true; +} + +void +Slice::Gen::Cpp11InterfaceVisitor::visitModuleEnd(const ModulePtr&) +{ + H << sp; + H << nl << '}'; + + _useWstring = resetUseWstring(_useWstringHist); +} + +bool +Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p) +{ + if(p->isLocal() || (!p->isInterface() && p->allOperations().empty())) + { + return false; + } + + string suffix = p->isInterface() ? "" : "Disp"; + + string name = fixKwd(p->name() + suffix); + string scope = fixKwd(p->scope()); + string scoped = fixKwd(p->scope() + p->name() + suffix); + ClassList bases = p->bases(); + ClassDefPtr base; + if(!bases.empty() && !bases.front()->isInterface()) + { + base = bases.front(); + } + DataMemberList dataMembers = p->dataMembers(); + DataMemberList allDataMembers = p->allDataMembers(); + + H << sp << nl << "class " << _dllExport << name << " : "; + H.useCurrentPosAsIndent(); + if(bases.empty() || (base && base->allOperations().empty())) + { + H << "virtual public ::Ice::Object"; + } + else + { + ClassList::const_iterator q = bases.begin(); + while(q != bases.end()) + { + string baseSuffix = (*q)->isInterface() ? "" : "Disp"; + string baseScoped = fixKwd((*q)->scope() + (*q)->name() + baseSuffix); + + H << "virtual public " << baseScoped; + if(++q != bases.end()) + { + H << ',' << nl; + } + } + } + + H.restoreIndent(); + H << sb; + H.dec(); + H << nl << "public:" << sp; + H.inc(); + + // + // In C++, a nested type cannot have the same name as the enclosing type + // + if(name != "ProxyType") + { + H << nl << "typedef " << p->name() << "Prx ProxyType;"; + } + + vector params; + vector allTypes; + vector allParamDecls; + + ClassList allBases = p->allBases(); + StringList ids; +#if defined(__IBMCPP__) && defined(NDEBUG) + // + // VisualAge C++ 6.0 does not see that ClassDef is a Contained, + // when inlining is on. The code below issues a warning: better + // than an error! + // + transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped)); +#else + transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped)); +#endif + StringList other; + other.push_back(p->scoped()); + other.push_back("::Ice::Object"); + other.sort(); + ids.merge(other); + ids.unique(); + StringList::const_iterator firstIter = ids.begin(); + StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped()); + assert(scopedIter != ids.end()); + StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter); + + H << sp; + H << nl << "virtual bool ice_isA" + << "(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;"; + H << nl << "virtual ::std::vector< ::std::string> ice_ids" + << "(const ::Ice::Current& = ::Ice::Current()) const;"; + H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;"; + H << nl << "static const ::std::string& ice_staticId();"; + + string flatName = p->flattenedScope() + p->name() + (p->isInterface() ? "" : "Disp") + "_ids"; + + C << sp << nl << "namespace"; + C << nl << "{"; + C << nl << "const ::std::string " << flatName << '[' << ids.size() << "] ="; + C << sb; + + for(StringList::const_iterator r = ids.begin(); r != ids.end();) + { + C << nl << '"' << *r << '"'; + if(++r != ids.end()) + { + C << ','; + } + } + + C << eb << ';'; + C << sp << nl << "}"; + + C << sp; + C << nl << "bool" << nl << scoped.substr(2) + << "::ice_isA(const ::std::string& _s, const ::Ice::Current&) const"; + C << sb; + C << nl << "return ::std::binary_search(" << flatName << ", " << flatName << " + " << ids.size() << ", _s);"; + C << eb; + + C << sp; + C << nl << "::std::vector< ::std::string>" << nl << scoped.substr(2) + << "::ice_ids(const ::Ice::Current&) const"; + C << sb; + C << nl << "return ::std::vector< ::std::string>(&" << flatName << "[0], &" << flatName + << '[' << ids.size() << "]);"; + C << eb; + + C << sp; + C << nl << "const ::std::string&" << nl << scoped.substr(2) + << "::ice_id(const ::Ice::Current&) const"; + C << sb; + C << nl << "return " << flatName << '[' << scopedPos << "];"; + C << eb; + + C << sp; + C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()"; + C << sb; + C << nl << "static const ::std::string typeId = \"" << *scopedIter << "\";"; + C << nl << "return typeId;"; + C << eb; + return true; +} + +void +Slice::Gen::Cpp11InterfaceVisitor::visitClassDefEnd(const ClassDefPtr& p) +{ + string suffix = p->isInterface() ? "" : "Disp"; + string scoped = fixKwd(p->scope() + p->name() + suffix); + + string scope = fixKwd(p->scope()); + string name = fixKwd(p->name() + suffix); + ClassList bases = p->bases(); + ClassDefPtr base; + if(!bases.empty() && !bases.front()->isInterface()) + { + base = bases.front(); + } + + OperationList allOps = p->allOperations(); + if(!allOps.empty()) + { + StringList allOpNames; +#if defined(__IBMCPP__) && defined(NDEBUG) +// +// See comment for transform above +// + transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), + ::IceUtil::constMemFun(&Contained::name)); +#else + transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), + ::IceUtil::constMemFun(&Contained::name)); +#endif + allOpNames.push_back("ice_id"); + allOpNames.push_back("ice_ids"); + allOpNames.push_back("ice_isA"); + allOpNames.push_back("ice_ping"); + allOpNames.sort(); + allOpNames.unique(); + + H << sp; + H << nl + << "virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);"; + + string flatName = p->flattenedScope() + name + "_all"; + C << sp << nl << "namespace"; + C << nl << "{"; + C << nl << "const ::std::string " << flatName << "[] ="; + C << sb; + + for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();) + { + C << nl << '"' << *q << '"'; + if(++q != allOpNames.end()) + { + C << ','; + } + } + C << eb << ';'; + C << sp << nl << "}"; + C << sp; + C << nl << "::Ice::DispatchStatus" << nl << scoped.substr(2) + << "::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)"; + C << sb; + + C << nl << "::std::pair< const ::std::string*, const ::std::string*> r = " + << "::std::equal_range(" << flatName << ", " << flatName << " + " << allOpNames.size() + << ", current.operation);"; + C << nl << "if(r.first == r.second)"; + C << sb; + C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, " + << "current.facet, current.operation);"; + C << eb; + C << sp; + C << nl << "switch(r.first - " << flatName << ')'; + C << sb; + int i = 0; + for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end(); ++q) + { + C << nl << "case " << i++ << ':'; + C << sb; + C << nl << "return ___" << *q << "(in, current);"; + C << eb; + } + C << eb; + C << sp; + C << nl << "assert(false);"; + C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, " + << "current.facet, current.operation);"; + C << eb; + + // + // Check if we need to generate ice_operationAttributes() + // + map attributesMap; + for(OperationList::iterator r = allOps.begin(); r != allOps.end(); ++r) + { + int attributes = (*r)->attributes(); + if(attributes != 0) + { + attributesMap.insert(map::value_type((*r)->name(), attributes)); + } + } + } + + H << eb << ';'; +} + +bool +Slice::Gen::Cpp11InterfaceVisitor::visitExceptionStart(const ExceptionPtr&) +{ + return false; +} + +bool +Slice::Gen::Cpp11InterfaceVisitor::visitStructStart(const StructPtr&) +{ + return false; +} + +void +Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) +{ + string name = p->name(); + + TypePtr ret = p->returnType(); + string retS = returnTypeToString(ret, p->returnIsOptional(), p->getMetaData(), _useWstring, true); + + string params = "("; + string paramsDecl = "("; + string args = "("; + + string paramsAMD; + string argsAMD; + + string responseParams; + string responseParamsDecl; + + ContainerPtr container = p->container(); + ClassDefPtr cl = ClassDefPtr::dynamicCast(container); + string classScope = fixKwd(cl->scope()); + + string suffix = cl->isInterface() ? "" : "Disp"; + string scope = fixKwd(cl->scope() + cl->name() + suffix + "::"); + string scoped = fixKwd(cl->scope() + cl->name() + suffix + "::" + p->name()); + + ParamDeclList inParams; + ParamDeclList outParams; + ParamDeclList paramList = p->parameters(); + vector< string> outDecls; + for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q) + { + string paramName = fixKwd(string(paramPrefix) + (*q)->name()); + TypePtr type = (*q)->type(); + bool isOutParam = (*q)->isOutParam(); + string typeString; + if(isOutParam) + { + outParams.push_back(*q); + typeString = outputTypeToString(type, (*q)->optional(), (*q)->getMetaData(), _useWstring, true); + outDecls.push_back(inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true)); + } + else + { + inParams.push_back(*q); + typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true); + } + + if(q != paramList.begin()) + { + params += ", "; + paramsDecl += ", "; + args += ", "; + } + + params += typeString; + paramsDecl += typeString; + paramsDecl += ' '; + paramsDecl += paramName; + args += paramName; + } + + if(!paramList.empty()) + { + params += ", "; + paramsDecl += ", "; + args += ", "; + } + + params += "const ::Ice::Current& = ::Ice::Current())"; + paramsDecl += "const ::Ice::Current& __current)"; + args += "__current)"; + + for(ParamDeclList::iterator q = inParams.begin(); q != inParams.end(); ++q) + { + if(q != inParams.begin()) + { + paramsAMD += ", "; + argsAMD += ", "; + } + paramsAMD += inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true); + argsAMD += fixKwd(string(paramPrefix) + (*q)->name()); + } + + if(ret) + { + string typeString = inputTypeToString(ret, p->returnIsOptional(), p->getMetaData(), _useWstring, true); + responseParams = typeString; + responseParamsDecl = typeString + " __ret"; + if(!outParams.empty()) + { + responseParams += ", "; + responseParamsDecl += ", "; + } + } + + for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q) + { + if(q != outParams.begin()) + { + responseParams += ", "; + responseParamsDecl += ", "; + } + string paramName = fixKwd(string(paramPrefix) + (*q)->name()); + string typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true); + responseParams += typeString; + responseParamsDecl += typeString + " " + paramName; + } + + bool isConst = (p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const"); + bool amd = (cl->hasMetaData("amd") || p->hasMetaData("amd")); + + ExceptionList throws = p->throws(); + throws.sort(); + throws.unique(); + + // + // Arrange exceptions into most-derived to least-derived order. If we don't + // do this, a base exception handler can appear before a derived exception + // handler, causing compiler warnings and resulting in the base exception + // being marshaled instead of the derived exception. + // +#if defined(__SUNPRO_CC) + throws.sort(derivedToBaseCompare); +#else + throws.sort(Slice::DerivedToBaseCompare()); +#endif + + string deprecateSymbol = getDeprecateSymbol(p, cl); + H << sp; + if(!amd) + { + H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params + << (isConst ? " const" : "") << " = 0;"; + } + else + { + H << nl << deprecateSymbol << "virtual void " << name << "_async("; + H.useCurrentPosAsIndent(); + H << paramsAMD; + if(!paramsAMD.empty()) + { + H << "," << nl; + } + H << "::std::function," << nl + << "::std::function, const Ice::Current&)" + << (isConst ? " const" : "") << " = 0;"; + H.restoreIndent(); + } + + H << sp; + H << nl << "::Ice::DispatchStatus ___" << name << "(::IceInternal::Incoming&, const ::Ice::Current&)" + << (isConst ? " const" : "") << ';'; + + C << sp; + C << nl << "::Ice::DispatchStatus" << nl << scope.substr(2) << "___" << name << "(::IceInternal::Incoming& __inS" + << ", const ::Ice::Current& __current)" << (isConst ? " const" : ""); + C << sb; + C << nl << "__checkMode(" << operationModeToString(p->mode(), true) << ", __current.mode);"; + + if(!inParams.empty()) + { + C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();"; + writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam | TypeContextReadClosure, true); + writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam); + if(p->sendsClasses(false)) + { + C << nl << "__is->readPendingObjects();"; + } + C << nl << "__inS.endReadParams();"; + } + else + { + C << nl << "__inS.readEmptyParams();"; + } + + if(!amd) + { + writeAllocateCode(C, outParams, 0, true, _useWstring, true); + if(!throws.empty()) + { + C << nl << "try"; + C << sb; + } + C << nl; + if(ret) + { + C << retS << " __ret = "; + } + C << fixKwd(name) << args << ';'; + if(ret || !outParams.empty()) + { + C << nl << "auto __os = __inS.__startWriteParams(" << opFormatTypeToString(p) << ");"; + writeMarshalCode(C, outParams, p, true); + if(p->returnsClasses(false)) + { + C << nl << "__os->writePendingObjects();"; + } + C << nl << "__inS.__endWriteParams(true);"; + } + else + { + C << nl << "__inS.__writeEmptyParams();"; + } + C << nl << "return ::Ice::DispatchOK;"; + if(!throws.empty()) + { + C << eb; + ExceptionList::const_iterator r; + for(r = throws.begin(); r != throws.end(); ++r) + { + C << nl << "catch(const " << fixKwd((*r)->scoped()) << "& __ex)"; + C << sb; + C << nl << "__inS.__writeUserException(__ex, " << opFormatTypeToString(p) << ");"; + C << eb; + } + C << nl << "return ::Ice::DispatchUserException;"; + } + } + else + { + C << nl << "auto inS = ::std::make_shared<::IceInternal::IncomingAsync>(__inS);"; + C << nl << "auto __exception = [inS](const ::std::exception_ptr& e)"; + C << sb; + C << nl << "try"; + C << sb; + C << nl << "std::rethrow_exception(e);"; + C << eb; + + for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r) + { + C << nl << "catch(const " << fixKwd((*r)->scoped()) << "& __ex)"; + C << sb; + C << nl <<"if(inS->__validateResponse(false))"; + C << sb; + C << nl << "inS->__writeUserException(__ex, " << opFormatTypeToString(p) << ");"; + C << nl << "inS->__response();"; + C << eb; + C << eb; + } + + C << nl << "catch(const ::std::exception& __ex)"; + C << sb; + C << nl << "inS->ice_exception(__ex);"; + C << eb; + C << nl << "catch(...)"; + C << sb; + C << nl << "inS->ice_exception();"; + C << eb; + C << eb << ";"; + + C << nl << "try"; + C << sb; + + C << nl << name << "_async("; + C.useCurrentPosAsIndent(); + if(!argsAMD.empty()) + { + C << argsAMD << ","; + C << nl; + } + C << "[inS](" << responseParamsDecl << ")"; + C << sb; + C << nl << "if(inS->__validateResponse(true))"; + C << sb; + if(ret || !outParams.empty()) + { + C << nl << "auto __os = inS->__startWriteParams(" << opFormatTypeToString(p) << ");"; + writeMarshalCode(C, outParams, p, true); + if(p->returnsClasses(false)) + { + C << nl << "__os->writePendingObjects();"; + } + C << nl << "inS->__endWriteParams(true);"; + } + else + { + C << nl << "inS->__writeEmptyParams();"; + } + C << nl << "inS->__response();"; + C << eb; + C << eb << ","; + C << nl << "__exception, __current);"; + C.restoreIndent(); + C << eb; + C << nl << "catch(...)"; + C << sb; + C << nl << "__exception(std::current_exception());"; + C << eb; + C << nl << "return ::Ice::DispatchAsync;"; + } + C << eb; +} + +Slice::Gen::Cpp11ValueVisitor::Cpp11ValueVisitor(::IceUtilInternal::Output& h, + ::IceUtilInternal::Output& c, + const std::string& dllExport, + bool stream) : + Cpp11ObjectVisitor(h, c, dllExport, stream) +{ +} + +bool +Slice::Gen::Cpp11ValueVisitor::visitModuleStart(const ModulePtr& p) +{ + if(!p->hasValueDefs()) + { + return false; + } + + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + string name = fixKwd(p->name()); + H << sp << nl << "namespace " << name << nl << '{'; + return true; +} + +void +Slice::Gen::Cpp11ValueVisitor::visitModuleEnd(const ModulePtr&) +{ + H << sp; + H << nl << '}'; + + _useWstring = resetUseWstring(_useWstringHist); +} + +bool +Slice::Gen::Cpp11ValueVisitor::visitClassDefStart(const ClassDefPtr& p) +{ + if(p->isLocal() || p->isInterface()) + { + return false; + } + _useWstring = setUseWstring(p, _useWstringHist, _useWstring); + + string name = fixKwd(p->name()); + string scope = fixKwd(p->scope()); + string scoped = fixKwd(p->scoped()); + ClassList bases = p->bases(); + ClassDefPtr base; + if(!bases.empty()) + { + base = bases.front(); + } + DataMemberList dataMembers = p->dataMembers(); + DataMemberList allDataMembers = p->allDataMembers(); + + H << sp << nl << "class " << _dllExport << name << " : "; + H.useCurrentPosAsIndent(); + if(!base || (base && base->isInterface())) + { + H << "public ::Ice::Value"; + } + else + { + H << "public " << fixKwd(base->scoped()); + } + + H.restoreIndent(); + H << sb; + H.dec(); + H << nl << "public:" << sp; + H.inc(); + + // + // In C++, a nested type cannot have the same name as the enclosing type + // + + if(p->name() != "PointerType") + { + H << nl << "typedef " << p->name() << "Ptr PointerType;"; + } + + vector params; + vector allTypes; + vector allParamDecls; + + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + params.push_back(fixKwd((*q)->name())); + } + + for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q) + { + string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring); + allTypes.push_back(typeName); + allParamDecls.push_back(typeName + " __ice_" + (*q)->name()); + } + + if(p->hasDefaultValues()) + { + H << sp << nl << name << "() :"; + H.inc(); + writeDataMemberInitializers(H, dataMembers, _useWstring); + H.dec(); + H << sb; + H << eb; + } + else + { + H << sp << nl << name << "()"; + H << sb << eb; + } + + emitOneShotConstructor(p); + H << sp; + H << nl << "virtual ::Ice::ValuePtr ice_clone() const;"; + H << sp; + H << nl << "static const ::std::string& ice_staticId();"; + return true; +} + +void +Slice::Gen::Cpp11ValueVisitor::visitClassDefEnd(const ClassDefPtr& p) +{ + string scoped = fixKwd(p->scoped()); + string scope = fixKwd(p->scope()); + ClassList bases = p->bases(); + ClassDefPtr base; + if(!bases.empty() && !bases.front()->isInterface()) + { + base = bases.front(); + } + bool basePreserved = p->inheritsMetaData("preserve-slice"); + bool preserved = p->hasMetaData("preserve-slice"); + + if(preserved && !basePreserved) + { + H << sp; + H << nl << "virtual void __write(::IceInternal::BasicStream*) const;"; + H << nl << "virtual void __read(::IceInternal::BasicStream*);"; + } + + H.dec(); + H << sp << nl << "protected:"; + H.inc(); + + H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;"; + H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);"; + + if(preserved && !basePreserved) + { + C << sp; + C << nl << "void" << nl << scoped.substr(2) + << "::__write(::IceInternal::BasicStream* __os) const"; + C << sb; + C << nl << "__os->startWriteObject(__slicedData);"; + C << nl << "__writeImpl(__os);"; + C << nl << "__os->endWriteObject();"; + C << eb; + + C << sp; + C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)"; + C << sb; + C << nl << "__is->startReadObject();"; + C << nl << "__readImpl(__is);"; + C << nl << "__slicedData = __is->endReadObject(true);"; + C << eb; + } + + C << sp; + C << nl << "void" << nl << scoped.substr(2) + << "::__writeImpl(::IceInternal::BasicStream* __os) const"; + C << sb; + C << nl << "__os->startWriteSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");"; + writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); + C << nl << "__os->endWriteSlice();"; + if(base) + { + emitUpcall(base, "::__writeImpl(__os);"); + } + C << eb; + + C << sp; + C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)"; + C << sb; + C << nl << "__is->startReadSlice();"; + writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); + C << nl << "__is->endReadSlice();"; + if(base) + { + emitUpcall(base, "::__readImpl(__is);"); + } + C << eb; + + C << sp; + C << nl << "::Ice::ValuePtr"; + C << nl << scoped.substr(2) << "::ice_clone() const"; + C << sb; + C << nl << "return ::std::make_shared<" << scoped << ">(*this);"; + C << eb; + + C << sp; + C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()"; + C << sb; + C << nl << "static const ::std::string typeId = \"" << p->scoped() << "\";"; + C << nl << "return typeId;"; + C << eb; + + C << sp << nl << "namespace"; + C << nl << "{"; + + string initName = p->flattenedScope() + p->name() + "_init"; + C << sp << nl << "const ::IceInternal::DefaultObjectFactoryInit< " << scoped << "> " + << initName << "(\"" << p->scoped() << "\");"; + + if(p->compactId() >= 0) + { + string initName = p->flattenedScope() + p->name() + "_compactIdInit"; + C << sp << nl << "const ::IceInternal::CompactIdInit " + << initName << "(\"" << p->scoped() << "\", " << p->compactId() << ");"; + } + C << nl << "}"; + + // + // Emit data members. Access visibility may be specified by metadata. + // + bool inProtected = true; + DataMemberList dataMembers = p->dataMembers(); + bool prot = p->hasMetaData("protected"); + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + if(prot || (*q)->hasMetaData("protected")) + { + if(!inProtected) + { + H.dec(); + H << sp << nl << "protected:"; + H.inc(); + inProtected = true; + } + } + else + { + if(inProtected) + { + H.dec(); + H << sp << nl << "public:"; + H.inc(); + inProtected = false; + } + } + + emitDataMember(*q); + } + + if(!_doneStaticSymbol) + { + H << sp << nl << "friend class " << p->name() << "__staticInit;"; + } + + if(preserved && !basePreserved) + { + if(!inProtected) + { + H.dec(); + H << sp << nl << "protected:"; + H.inc(); + inProtected = true; + } + H << sp << nl << "::Ice::SlicedDataPtr __slicedData;"; + } + + H << eb << ';'; + + if(!_doneStaticSymbol) + { + // + // We need an instance here to trigger initialization if the implementation is in a shared library. + // But we do this only once per source file, because a single instance is sufficient to initialize + // all of the globals in a shared library. + // + // For a Slice class Foo, we instantiate a dummy class Foo__staticInit instead of using a static + // Foo instance directly because Foo has a protected destructor. + // + H << sp << nl << "class " << p->name() << "__staticInit"; + H << sb; + H.dec(); + H << nl << "public:"; + H.inc(); + H << sp << nl << scoped << " _init;"; + H << eb << ';'; + _doneStaticSymbol = true; + H << sp << nl << "static " << p->name() << "__staticInit _" << p->name() << "_init;"; + } + + _useWstring = resetUseWstring(_useWstringHist); +} + +bool +Slice::Gen::Cpp11ValueVisitor::visitExceptionStart(const ExceptionPtr&) +{ + return false; +} + +bool +Slice::Gen::Cpp11ValueVisitor::visitStructStart(const StructPtr&) +{ + return false; +} + +void +Slice::Gen::Cpp11ValueVisitor::visitOperation(const OperationPtr&) +{ +} + + +bool +Slice::Gen::Cpp11ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& p, bool virtualInheritance, bool direct) +{ + DataMemberList allDataMembers = p->allDataMembers(); + if(allDataMembers.empty()) + { + return false; + } + + ClassList bases = p->bases(); + if(!bases.empty() && !bases.front()->isInterface()) + { + if(emitVirtualBaseInitializers(bases.front(), false, false)) + { + H << ','; + } + } + + // + // Do not call non direct base classes constructor if not using virtual inheritance. + // + if(!direct && !virtualInheritance) + { + return false; + } + + string upcall = "("; + for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q) + { + if(q != allDataMembers.begin()) + { + upcall += ", "; + } + upcall += "__ice_" + (*q)->name(); + } + upcall += ")"; + + H << nl << fixKwd(p->scoped()) << upcall; + + return true; +} + +void +Slice::Gen::Cpp11ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p) +{ + DataMemberList allDataMembers = p->allDataMembers(); + + if(!allDataMembers.empty()) + { + vector allParamDecls; + DataMemberList dataMembers = p->dataMembers(); + + for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q) + { + + string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring); + allParamDecls.push_back(typeName + " __ice_" + (*q)->name()); + } + + H << sp << nl; + if(allParamDecls.size() == 1) + { + H << "explicit "; + } + H << fixKwd(p->name()) << spar << allParamDecls << epar << " :"; + H.inc(); + + ClassList bases = p->bases(); + ClassDefPtr base; + + if(!bases.empty() && !bases.front()->isInterface()) + { + if(emitVirtualBaseInitializers(bases.front(), false, true)) + { + if(!dataMembers.empty()) + { + H << ','; + } + } + } + + if(!dataMembers.empty()) + { + H << nl; + } + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + if(q != dataMembers.begin()) + { + H << ',' << nl; + } + string memberName = fixKwd((*q)->name()); + H << memberName << '(' << "__ice_" << (*q)->name() << ')'; + } + + H.dec(); + H << sb; + H << eb; + } +} + +Slice::Gen::Cpp11StreamVisitor::Cpp11StreamVisitor(Output& h, Output& c, const string& dllExport) : + H(h), + C(c), + _dllExport(dllExport) +{ +} + +bool +Slice::Gen::Cpp11StreamVisitor::visitModuleStart(const ModulePtr& m) +{ + if(!m->hasNonLocalContained(Contained::ContainedTypeStruct) && + !m->hasNonLocalContained(Contained::ContainedTypeEnum) && + !m->hasNonLocalContained(Contained::ContainedTypeException)) + { + return false; + } + + if(UnitPtr::dynamicCast(m->container())) + { + // + // Only emit this for the top-level module. + // + H << sp; + H << nl << "namespace Ice" << nl << '{'; + + C << sp; + C << nl << "namespace Ice" << nl << '{'; + } + + return true; +} + +void +Slice::Gen::Cpp11StreamVisitor::visitModuleEnd(const ModulePtr& m) +{ + if(UnitPtr::dynamicCast(m->container())) + { + // + // Only emit this for the top-level module. + // + H << nl << '}'; + C << nl << '}'; + } +} + +bool +Slice::Gen::Cpp11StreamVisitor::visitExceptionStart(const ExceptionPtr&) +{ + return false; +} + +bool +Slice::Gen::Cpp11StreamVisitor::visitStructStart(const StructPtr& p) +{ + if(!p->isLocal()) + { + string scoped = fixKwd(p->scoped()); + + H << nl << "template<>"; + + H << nl << "struct StreamableTraits< " << scoped << ">"; + + H << sb; + H << nl << "static const StreamHelperCategory helper = StreamHelperCategoryStruct;"; + + H << nl << "static const int minWireSize = " << p->minWireSize() << ";"; + if(p->isVariableLength()) + { + H << nl << "static const bool fixedLength = false;"; + } + else + { + H << nl << "static const bool fixedLength = true;"; + } + H << eb << ";" << nl; + + DataMemberList dataMembers = p->dataMembers(); + + H << nl << "template"; + H << nl << "struct StreamWriter< " << scoped << ", S>"; + H << sb; + H << nl << "static void write(S* __os, const " << scoped << "& v)"; + H << sb; + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + writeMarshalUnmarshalDataMemberInHolder(H, "v.", *q, true); + } + H << eb; + H << eb << ";" << nl; + + H << nl << "template"; + H << nl << "struct StreamReader< " << scoped << ", S>"; + H << sb; + H << nl << "static void read(S* __is, " << scoped << "& v)"; + H << sb; + for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) + { + writeMarshalUnmarshalDataMemberInHolder(H, "v.", *q, false); + } + H << eb; + H << eb << ";" << nl; + + if(!_dllExport.empty()) + { + // + // We tell "importers" that the implementation exports these instantiations + // + H << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined("; + H << _dllExport.substr(0, _dllExport.size() - 1) + "_EXPORTS) && !defined(ICE_STATIC_LIBS)"; + H << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::IceInternal::BasicStream>;"; + H << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::IceInternal::BasicStream>;"; + H << nl << "#endif" << nl; + + // + // The instantations: + // + C << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)"; + C << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::IceInternal::BasicStream>;"; + C << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::IceInternal::BasicStream>;"; + C << nl << "#endif"; + } + } + return false; +} + +void +Slice::Gen::Cpp11StreamVisitor::visitEnum(const EnumPtr& p) +{ + if(!p->isLocal()) + { + string scoped = fixKwd(p->scoped()); + H << nl << "template<>"; + H << nl << "struct StreamableTraits< " << scoped << ">"; + H << sb; + H << nl << "static const StreamHelperCategory helper = StreamHelperCategoryEnum;"; + H << nl << "static const int minValue = " << p->minValue() << ";"; + H << nl << "static const int maxValue = " << p->maxValue() << ";"; + H << nl << "static const int minWireSize = " << p->minWireSize() << ";"; + H << nl << "static const bool fixedLength = false;"; + H << eb << ";" << nl; + } +} + +Slice::Gen::Cpp11InterfaceTraitsVisitor::Cpp11InterfaceTraitsVisitor(Output& h, Output& c, const string& dllExport) : + H(h), C(c), _dllExport(dllExport) +{ +} + +bool +Slice::Gen::Cpp11InterfaceTraitsVisitor::visitUnitStart(const UnitPtr& p) +{ + if(!p->hasNonLocalClassDecls()) + { + return false; + } + + H << sp << nl << "namespace Ice" << nl << '{'; + + return true; +} + +void +Slice::Gen::Cpp11InterfaceTraitsVisitor::visitUnitEnd(const UnitPtr&) +{ + H << sp << nl << '}'; +} + +bool +Slice::Gen::Cpp11InterfaceTraitsVisitor::visitClassDefStart(const ClassDefPtr& p) +{ + if(!p->isInterface() || p->isLocal()) + { + return false; + } + H << sp; + H << nl << "template<>"; + H << nl << "struct InterfaceTraits<" << fixKwd(p->scoped()) << ">"; + H << sb; + H << nl << "static const std::string staticId;"; + H << nl << "static const int compactId = " << p->compactId() << ";"; + H << eb << ";"; + + C << sp; + C << nl << "const std::string Ice::InterfaceTraits<" << fixKwd(p->scoped()) << ">::staticId = \"" << p->scoped() << "\";"; + return true; +} diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index ea122709a6e..1877ff01d88 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -36,7 +36,7 @@ public: void generate(const UnitPtr&); void closeOutput(); - + static int setUseWstring(ContainedPtr, std::list&, int); static int resetUseWstring(std::list&); @@ -321,7 +321,7 @@ private: int _useWstring; std::list _useWstringHist; }; - + class StreamVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: @@ -340,6 +340,253 @@ private: ::IceUtilInternal::Output& C; std::string _dllExport; }; + // + // C++11 Visitors + // + class Cpp11ObjectDeclVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11ObjectDeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual void visitClassDecl(const ClassDeclPtr&); + virtual void visitOperation(const OperationPtr&); + + private: + + ::IceUtilInternal::Output& H; + ::IceUtilInternal::Output& C; + + std::string _dllExport; + }; + + class Cpp11TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual bool visitExceptionStart(const ExceptionPtr&); + virtual void visitExceptionEnd(const ExceptionPtr&); + virtual bool visitStructStart(const StructPtr&); + virtual void visitStructEnd(const StructPtr&); + virtual void visitSequence(const SequencePtr&); + virtual void visitDictionary(const DictionaryPtr&); + virtual void visitEnum(const EnumPtr&); + virtual void visitConst(const ConstPtr&); + virtual void visitDataMember(const DataMemberPtr&); + + private: + + void emitUpcall(const ExceptionPtr&, const std::string&, bool = false); + + ::IceUtilInternal::Output& H; + ::IceUtilInternal::Output& C; + + std::string _dllExport; + bool _stream; + bool _doneStaticSymbol; + int _useWstring; + std::list _useWstringHist; + }; + + class Cpp11ProxyVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11ProxyVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + + virtual bool visitUnitStart(const UnitPtr&); + virtual void visitUnitEnd(const UnitPtr&); + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual void visitClassDefEnd(const ClassDefPtr&); + virtual void visitOperation(const OperationPtr&); + + private: + + ::IceUtilInternal::Output& H; + ::IceUtilInternal::Output& C; + + std::string _dllExport; + int _useWstring; + std::list _useWstringHist; + }; + + class Cpp11ProxyDeclVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11ProxyDeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + + virtual bool visitUnitStart(const UnitPtr&); + virtual void visitUnitEnd(const UnitPtr&); + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual void visitClassDecl(const ClassDeclPtr&); + + private: + + ::IceUtilInternal::Output& H; + + std::string _dllExport; + }; + + class Cpp11ObjectVisitor : public ParserVisitor + { + public: + + Cpp11ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + + protected: + + bool emitVirtualBaseInitializers(const ClassDefPtr&, bool, bool); + void emitOneShotConstructor(const ClassDefPtr&); + void emitDataMember(const DataMemberPtr&); + + ::IceUtilInternal::Output& H; + ::IceUtilInternal::Output& C; + + std::string _dllExport; + bool _stream; + bool _doneStaticSymbol; + int _useWstring; + std::list _useWstringHist; + }; + + class Cpp11LocalObjectVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor + { + public: + + Cpp11LocalObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual void visitClassDefEnd(const ClassDefPtr&); + virtual bool visitExceptionStart(const ExceptionPtr&); + virtual bool visitStructStart(const StructPtr&); + virtual void visitOperation(const OperationPtr&); + }; + + class Cpp11InterfaceVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor + { + public: + + Cpp11InterfaceVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual void visitClassDefEnd(const ClassDefPtr&); + virtual bool visitExceptionStart(const ExceptionPtr&); + virtual bool visitStructStart(const StructPtr&); + virtual void visitOperation(const OperationPtr&); + void emitUpcall(const ClassDefPtr&, const std::string&); + }; + + class Cpp11ValueVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor + { + public: + + Cpp11ValueVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual void visitClassDefEnd(const ClassDefPtr&); + virtual bool visitExceptionStart(const ExceptionPtr&); + virtual bool visitStructStart(const StructPtr&); + virtual void visitOperation(const OperationPtr&); + void emitUpcall(const ClassDefPtr&, const std::string&); + }; + + class Cpp11AsyncVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11AsyncVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual void visitClassDefEnd(const ClassDefPtr&); + virtual void visitOperation(const OperationPtr&); + + private: + + ::IceUtilInternal::Output& H; + + std::string _dllExport; + int _useWstring; + std::list _useWstringHist; + }; + + class Cpp11AsyncImplVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11AsyncImplVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + + virtual bool visitUnitStart(const UnitPtr&); + virtual void visitUnitEnd(const UnitPtr&); + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + virtual void visitClassDefEnd(const ClassDefPtr&); + virtual void visitOperation(const OperationPtr&); + + private: + + ::IceUtilInternal::Output& H; + ::IceUtilInternal::Output& C; + + std::string _dllExport; + int _useWstring; + std::list _useWstringHist; + }; + + class Cpp11StreamVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11StreamVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + + virtual bool visitModuleStart(const ModulePtr&); + virtual void visitModuleEnd(const ModulePtr&); + virtual bool visitStructStart(const StructPtr&); + virtual bool visitExceptionStart(const ExceptionPtr&); + virtual void visitEnum(const EnumPtr&); + + private: + + ::IceUtilInternal::Output& H; + ::IceUtilInternal::Output& C; + std::string _dllExport; + }; + + class Cpp11InterfaceTraitsVisitor : private ::IceUtil::noncopyable, public ParserVisitor + { + public: + + Cpp11InterfaceTraitsVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + + virtual bool visitUnitStart(const UnitPtr&); + virtual void visitUnitEnd(const UnitPtr&); + virtual bool visitClassDefStart(const ClassDefPtr&); + + private: + + ::IceUtilInternal::Output& H; + ::IceUtilInternal::Output& C; + std::string _dllExport; + }; private: diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 2f901505901..12f86b183a0 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -365,6 +365,7 @@ Slice::CsVisitor::writeStreamMarshalDataMember(const DataMemberPtr& member, cons case Builtin::KindString: case Builtin::KindObject: case Builtin::KindObjectProxy: + case Builtin::KindValue: { _out << nl << "int pos__ = outS__.startSize();"; writeMarshalUnmarshalCode(_out, member->type(), value, true, true); diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index e2c8474b2c1..e5876b07211 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -124,6 +124,7 @@ initValue(const TypePtr& p) case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { return "null"; } @@ -1938,6 +1939,7 @@ Slice::JavaVisitor::writeConstantValue(Output& out, const TypePtr& type, const S case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { out << value; break; @@ -3979,6 +3981,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { out << nl << "if(" << memberName << " != _r." << memberName << ')'; out << sb; @@ -6319,6 +6322,7 @@ Slice::Gen::BaseImplVisitor::writeDecl(Output& out, const string& package, const case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { out << " = null"; break; @@ -6392,6 +6396,7 @@ Slice::Gen::BaseImplVisitor::writeReturn(Output& out, const TypePtr& type, bool case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { out << nl << "return null;"; break; diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp index 7cc017bc16d..65c57c30623 100644 --- a/cpp/src/slice2js/JsUtil.cpp +++ b/cpp/src/slice2js/JsUtil.cpp @@ -192,6 +192,7 @@ Slice::JsGenerator::getOptionalFormat(const TypePtr& type) return "Ice.OptionalFormat.VSize"; } case Builtin::KindObject: + case Builtin::KindValue: { return "Ice.OptionalFormat.Class"; } @@ -503,6 +504,7 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out, return; } case Builtin::KindObject: + case Builtin::KindValue: { // Handle by isClassType below. break; @@ -670,6 +672,7 @@ Slice::JsGenerator::getHelper(const TypePtr& type) return "Ice.StringHelper"; } case Builtin::KindObject: + case Builtin::KindValue: { return "Ice.ObjectHelper"; } diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index 82a3dc40635..88a37ef619a 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -905,6 +905,7 @@ CodeVisitor::visitDictionary(const DictionaryPtr& p) case Slice::Builtin::KindObject: case Slice::Builtin::KindObjectProxy: case Slice::Builtin::KindLocalObject: + case Slice::Builtin::KindValue: assert(false); } } @@ -1098,6 +1099,7 @@ CodeVisitor::writeType(const TypePtr& p) break; } case Builtin::KindObject: + case Builtin::KindValue: { _out << "$Ice__t_Object"; break; @@ -1164,6 +1166,7 @@ CodeVisitor::writeDefaultValue(const DataMemberPtr& m) case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { _out << "null"; break; @@ -1342,6 +1345,7 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va case Slice::Builtin::KindObject: case Slice::Builtin::KindObjectProxy: case Slice::Builtin::KindLocalObject: + case Slice::Builtin::KindValue: assert(false); } } -- cgit v1.2.3