summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/.depend47
-rw-r--r--cpp/src/Ice/Endpoint.cpp24
-rw-r--r--cpp/src/Ice/Endpoint.h5
-rw-r--r--cpp/src/Ice/LocalObject.cpp24
-rw-r--r--cpp/src/Ice/Makefile18
-rw-r--r--cpp/src/Ice/Object.cpp8
-rw-r--r--cpp/src/Ice/Proxy.cpp6
-rw-r--r--cpp/src/Ice/Reference.cpp34
-rw-r--r--cpp/src/Ice/Reference.h1
-rw-r--r--cpp/src/Ice/SslConfig.h4
-rw-r--r--cpp/src/Ice/SslSystem.h6
-rw-r--r--cpp/src/Ice/ice.dsp80
-rw-r--r--cpp/src/Slice/Grammar.y535
-rw-r--r--cpp/src/Slice/Parser.cpp468
-rw-r--r--cpp/src/Slice/Scanner.l116
-rw-r--r--cpp/src/slice2cpp/Gen.cpp345
-rw-r--r--cpp/src/slice2cpp/Gen.h21
17 files changed, 1045 insertions, 697 deletions
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index b9004fd26a6..4b29809a0f6 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -1,41 +1,42 @@
Initialize.o: Initialize.cpp ../Ice/CommunicatorI.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../Ice/PropertiesI.h ../../include/Ice/Properties.h
-Application.o: Application.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Stream.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/IdentityUtil.h
+Application.o: Application.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Stream.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/IdentityUtil.h
Exception.o: Exception.cpp ../../include/Ice/Exception.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/LocalException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/Network.h
-LocalException.o: LocalException.cpp ../../include/Ice/LocalException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
-Properties.o: Properties.cpp ../../include/Ice/Properties.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+LocalException.o: LocalException.cpp ../../include/Ice/LocalException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+Properties.o: Properties.cpp ../../include/Ice/Properties.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
PropertiesI.o: PropertiesI.cpp ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
-Logger.o: Logger.cpp ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+Logger.o: Logger.cpp ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
LoggerI.o: LoggerI.cpp ../Ice/LoggerI.h ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
-Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
StreamI.o: StreamI.cpp ../Ice/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
-BasicStream.o: BasicStream.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/ObjectFactory.h ../Ice/ObjectFactoryManager.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactory.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h
+BasicStream.o: BasicStream.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/ObjectFactory.h ../Ice/ObjectFactoryManager.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactory.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h
SysLoggerI.o: SysLoggerI.cpp ../Ice/SysLoggerI.h ../../include/Ice/Logger.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
TraceLevels.o: TraceLevels.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Properties.h
-TraceUtil.o: TraceUtil.cpp ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Protocol.h ../../include/Ice/IdentityUtil.h
+TraceUtil.o: TraceUtil.cpp ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Protocol.h ../../include/Ice/IdentityUtil.h
Instance.o: Instance.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../Ice/EventHandlerF.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/EndpointF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/ObjectFactoryManager.h ../../include/Ice/ObjectFactoryF.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/CollectorF.h ../../include/Ice/Properties.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/Network.h ../Ice/SysLoggerI.h
-Communicator.o: Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+Communicator.o: Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
CommunicatorI.o: CommunicatorI.cpp ../Ice/CommunicatorI.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/StreamF.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../Ice/ProxyFactory.h ../../include/Ice/ReferenceF.h ../Ice/ThreadPool.h ../Ice/EventHandlerF.h ../Ice/ObjectFactoryManager.h ../Ice/UserExceptionFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/CollectorF.h ../Ice/EndpointF.h ../../include/Ice/Logger.h ../Ice/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
-ObjectFactory.o: ObjectFactory.cpp ../../include/Ice/ObjectFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+ObjectFactory.o: ObjectFactory.cpp ../../include/Ice/ObjectFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
ObjectFactoryManager.o: ObjectFactoryManager.cpp ../Ice/ObjectFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
-ObjectAdapter.o: ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h
-ObjectAdapterI.o: ObjectAdapterI.cpp ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../Ice/EndpointF.h ../../include/Ice/ServantLocator.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Collector.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
+ObjectAdapter.o: ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Object.h
+ObjectAdapterI.o: ObjectAdapterI.cpp ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../Ice/EndpointF.h ../../include/Ice/ServantLocator.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Collector.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../Ice/EndpointF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h
-ServantLocator.o: ServantLocator.cpp ../../include/Ice/ServantLocator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
-UserExceptionFactory.o: UserExceptionFactory.cpp ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+ServantLocator.o: ServantLocator.cpp ../../include/Ice/ServantLocator.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
+UserExceptionFactory.o: UserExceptionFactory.cpp ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
UserExceptionFactoryManager.o: UserExceptionFactoryManager.cpp ../Ice/UserExceptionFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/UdpTransceiver.h ../../include/Ice/BasicStream.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h
Reference.o: Reference.cpp ../Ice/Reference.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Identity.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/IdentityUtil.h
-Identity.o: Identity.cpp ../../include/Ice/Identity.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h
+Identity.o: Identity.cpp ../../include/Ice/Identity.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Object.h
IdentityUtil.o: IdentityUtil.cpp ../../include/Ice/IdentityUtil.h ../../include/Ice/Identity.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
-Current.o: Current.cpp ../../include/Ice/Current.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
+Current.o: Current.cpp ../../include/Ice/Current.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
+Connection.o: Connection.cpp ../../include/Ice/Connection.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
LocalObject.o: LocalObject.cpp ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h
-Object.o: Object.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Current.h ../../include/Ice/Identity.h
-ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
-Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../Ice/EndpointF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Direct.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SecurityException.h
-Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../Ice/ProxyFactory.h
-Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
-Direct.o: Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocator.h ../Ice/Reference.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h
-Emitter.o: Emitter.cpp ../Ice/Emitter.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ThreadPool.h ../Ice/Endpoint.h ../Ice/AcceptorF.h ../../include/Ice/Outgoing.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/Protocol.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SecurityException.h
+Object.o: Object.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h
+ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h
+Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/CollectorF.h ../Ice/EndpointF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Direct.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SecurityException.h
+Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Proxy.h ../../include/Ice/ObjectAdapterF.h ../Ice/ProxyFactory.h
+Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h
+Direct.o: Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantLocator.h ../Ice/Reference.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h
+Emitter.o: Emitter.cpp ../Ice/Emitter.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ThreadPool.h ../Ice/Endpoint.h ../Ice/AcceptorF.h ../../include/Ice/Outgoing.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/Protocol.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SecurityException.h
Collector.o: Collector.cpp ../Ice/Collector.h ../../include/Ice/CollectorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/AcceptorF.h ../Ice/ThreadPoolF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../../include/Ice/Incoming.h ../Ice/Protocol.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SecurityException.h
Network.o: Network.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/Exception.h ../../include/IceUtil/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/LocalObject.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Identity.h ../../include/Ice/CollectorF.h ../Ice/EndpointF.h
@@ -46,7 +47,7 @@ Transceiver.o: Transceiver.cpp ../Ice/Transceiver.h ../../include/IceUtil/Shared
TcpConnector.o: TcpConnector.cpp ../Ice/TcpConnector.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h
TcpAcceptor.o: TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h
TcpTransceiver.o: TcpTransceiver.cpp ../Ice/TcpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/Buffer.h ../Ice/Network.h
-SecurityException.o: SecurityException.cpp ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
+SecurityException.o: SecurityException.cpp ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h
SecurityException2.o: SecurityException2.cpp ../../include/Ice/SecurityException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h
SslConnector.o: SslConnector.cpp ../Ice/SslFactory.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../Ice/SslConnector.h ../Ice/TransceiverF.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/Network.h ../../include/Ice/SecurityException.h
SslAcceptor.o: SslAcceptor.cpp ../Ice/SslFactory.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../Ice/SslAcceptor.h ../Ice/TransceiverF.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/Network.h ../../include/Ice/SecurityException.h
diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index ad3590e9645..3064f54b99b 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -220,6 +220,12 @@ IceInternal::UnknownEndpoint::operator==(const Endpoint& r) const
}
bool
+IceInternal::UnknownEndpoint::operator!=(const Endpoint& r) const
+{
+ return !operator==(r);
+}
+
+bool
IceInternal::UnknownEndpoint::operator<(const Endpoint& r) const
{
const UnknownEndpoint* p = dynamic_cast<const UnknownEndpoint*>(&r);
@@ -499,6 +505,12 @@ IceInternal::TcpEndpoint::operator==(const Endpoint& r) const
}
bool
+IceInternal::TcpEndpoint::operator!=(const Endpoint& r) const
+{
+ return !operator==(r);
+}
+
+bool
IceInternal::TcpEndpoint::operator<(const Endpoint& r) const
{
const TcpEndpoint* p = dynamic_cast<const TcpEndpoint*>(&r);
@@ -801,6 +813,12 @@ IceInternal::SslEndpoint::operator==(const Endpoint& r) const
}
bool
+IceInternal::SslEndpoint::operator!=(const Endpoint& r) const
+{
+ return !operator==(r);
+}
+
+bool
IceInternal::SslEndpoint::operator<(const Endpoint& r) const
{
const SslEndpoint* p = dynamic_cast<const SslEndpoint*>(&r);
@@ -1080,6 +1098,12 @@ IceInternal::UdpEndpoint::operator==(const Endpoint& r) const
}
bool
+IceInternal::UdpEndpoint::operator!=(const Endpoint& r) const
+{
+ return !operator==(r);
+}
+
+bool
IceInternal::UdpEndpoint::operator<(const Endpoint& r) const
{
const UdpEndpoint* p = dynamic_cast<const UdpEndpoint*>(&r);
diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h
index 8132ccc7acc..bd34cd5ca5d 100644
--- a/cpp/src/Ice/Endpoint.h
+++ b/cpp/src/Ice/Endpoint.h
@@ -126,6 +126,7 @@ public:
// Compare endpoints for sorting purposes
//
virtual bool operator==(const Endpoint&) const = 0;
+ virtual bool operator!=(const Endpoint&) const = 0;
virtual bool operator<(const Endpoint&) const = 0;
};
@@ -151,6 +152,7 @@ public:
virtual bool equivalent(const AcceptorPtr&) const;
virtual bool operator==(const Endpoint&) const;
+ virtual bool operator!=(const Endpoint&) const;
virtual bool operator<(const Endpoint&) const;
private:
@@ -186,6 +188,7 @@ public:
virtual bool equivalent(const AcceptorPtr&) const;
virtual bool operator==(const Endpoint&) const;
+ virtual bool operator!=(const Endpoint&) const;
virtual bool operator<(const Endpoint&) const;
private:
@@ -223,6 +226,7 @@ public:
virtual bool equivalent(const AcceptorPtr&) const;
virtual bool operator==(const Endpoint&) const;
+ virtual bool operator!=(const Endpoint&) const;
virtual bool operator<(const Endpoint&) const;
private:
@@ -260,6 +264,7 @@ public:
virtual bool equivalent(const AcceptorPtr&) const;
virtual bool operator==(const Endpoint&) const;
+ virtual bool operator!=(const Endpoint&) const;
virtual bool operator<(const Endpoint&) const;
private:
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index b4efdd39bb9..1db685549ae 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -16,3 +16,27 @@ using namespace IceInternal;
void IceInternal::incRef(LocalObject* p) { p->__incRef(); }
void IceInternal::decRef(LocalObject* p) { p->__decRef(); }
+
+bool
+Ice::LocalObject::operator==(const LocalObject& r) const
+{
+ return this == &r;
+}
+
+bool
+Ice::LocalObject::operator!=(const LocalObject& r) const
+{
+ return this != &r;
+}
+
+bool
+Ice::LocalObject::operator<(const LocalObject& r) const
+{
+ return this < &r;
+}
+
+Int
+Ice::LocalObject::ice_hash() const
+{
+ return reinterpret_cast<Int>(this) >> 4;
+}
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 5498dcb0004..bd012da16fb 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -48,6 +48,7 @@ OBJS = Initialize.o \
Identity.o \
IdentityUtil.o \
Current.o \
+ Connection.o \
LocalObject.o \
Object.o \
ProxyFactory.o \
@@ -274,4 +275,21 @@ $(HDIR)/Current.h Current.cpp: $(SDIR)/Current.ice $(SLICE2CPP)
clean::
rm -f $(HDIR)/Current.h Current.cpp
+$(HDIR)/Connection.h Connection.cpp: $(SDIR)/Connection.ice $(SLICE2CPP)
+ rm -f $(HDIR)/Connection.h Connection.cpp
+ $(SLICECMD) $(SDIR)/Connection.ice
+ mv Connection.h $(HDIR)
+
+clean::
+ rm -f $(HDIR)/Connection.h Connection.cpp
+
+$(HDIR)/ConnectionF.h: $(SDIR)/ConnectionF.ice $(SLICE2CPP)
+ rm -f $(HDIR)/ConnectionF.h ConnectionF.cpp
+ $(SLICECMD) $(SDIR)/ConnectionF.ice
+ mv ConnectionF.h $(HDIR)
+ rm -f ConnectionF.cpp
+
+clean::
+ rm -f $(HDIR)/ConnectionF.h
+
include .depend
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 4bdb69d73ab..4758a174bd7 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -41,6 +41,12 @@ Ice::Object::operator==(const Object& r) const
}
bool
+Ice::Object::operator!=(const Object& r) const
+{
+ return this != &r;
+}
+
+bool
Ice::Object::operator<(const Object& r) const
{
return this < &r;
@@ -49,7 +55,7 @@ Ice::Object::operator<(const Object& r) const
Int
Ice::Object::ice_hash() const
{
- return reinterpret_cast<Int>(this);
+ return reinterpret_cast<Int>(this) >> 4;
}
const string Ice::Object::__classIds[] =
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 4cf5900ab9d..e00d385ecc4 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -88,6 +88,12 @@ IceProxy::Ice::Object::operator==(const Object& r) const
}
bool
+IceProxy::Ice::Object::operator!=(const Object& r) const
+{
+ return _reference != r._reference;
+}
+
+bool
IceProxy::Ice::Object::operator<(const Object& r) const
{
return _reference < r._reference;
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 4be2445aa9c..712d45783b5 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -347,63 +347,69 @@ IceInternal::Reference::operator==(const Reference& r) const
}
bool
-IceInternal::Reference::operator<(const Reference& rhs) const
+IceInternal::Reference::operator!=(const Reference& r) const
{
- if (this == &rhs)
+ return !operator==(r);
+}
+
+bool
+IceInternal::Reference::operator<(const Reference& r) const
+{
+ if (this == &r)
{
return false;
}
- if (identity < rhs.identity)
+ if (identity < r.identity)
{
return true;
}
- else if (rhs.identity < identity)
+ else if (r.identity < identity)
{
return false;
}
- if (facet < rhs.facet)
+ if (facet < r.facet)
{
return true;
}
- else if (rhs.facet < facet)
+ else if (r.facet < facet)
{
return false;
}
- if (mode < rhs.mode)
+ if (mode < r.mode)
{
return true;
}
- else if (rhs.mode < mode)
+ else if (r.mode < mode)
{
return false;
}
- if (!secure && rhs.secure)
+ if (!secure && r.secure)
{
return true;
}
- else if (rhs.secure < secure)
+ else if (r.secure < secure)
{
return false;
}
- if (origEndpoints < rhs.origEndpoints)
+ if (origEndpoints < r.origEndpoints)
{
return true;
}
- else if (rhs.origEndpoints < origEndpoints)
+ else if (r.origEndpoints < origEndpoints)
{
return false;
}
- if (endpoints < rhs.endpoints)
+ if (endpoints < r.endpoints)
{
return true;
}
- else if (rhs.endpoints < endpoints)
+ else if (r.endpoints < endpoints)
{
return false;
}
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index 0427b166d5c..04fff0580eb 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -42,6 +42,7 @@ public:
Reference(const Ice::Identity&, BasicStream*);
bool operator==(const Reference&) const;
+ bool operator!=(const Reference&) const;
bool operator<(const Reference&) const;
//
diff --git a/cpp/src/Ice/SslConfig.h b/cpp/src/Ice/SslConfig.h
index 476e5dde530..d5f261cfa54 100644
--- a/cpp/src/Ice/SslConfig.h
+++ b/cpp/src/Ice/SslConfig.h
@@ -49,10 +49,10 @@ public:
bool loadServerConfig(GeneralConfig&, CertificateAuthority&, BaseCertificates&, TempCertificates&);
inline void setTrace(TraceLevelsPtr traceLevels) { _traceLevels = traceLevels; };
- inline bool isTraceSet() const { return (_traceLevels == 0 ? false : true); };
+ inline bool isTraceSet() const { return _traceLevels; };
inline void setLogger(LoggerPtr traceLevels) { _logger = traceLevels; };
- inline bool isLoggerSet() const { return (_logger == 0 ? false : true); };
+ inline bool isLoggerSet() const { return _logger; };
private:
diff --git a/cpp/src/Ice/SslSystem.h b/cpp/src/Ice/SslSystem.h
index fe585fd212f..ed73f5de9f6 100644
--- a/cpp/src/Ice/SslSystem.h
+++ b/cpp/src/Ice/SslSystem.h
@@ -44,13 +44,13 @@ public:
virtual Connection* createClientConnection(int) = 0;
void setTrace(TraceLevelsPtr traceLevels) { _traceLevels = traceLevels; };
- bool isTraceSet() const { return (_traceLevels == 0 ? false : true); };
+ bool isTraceSet() const { return _traceLevels; };
void setLogger(LoggerPtr traceLevels) { _logger = traceLevels; };
- bool isLoggerSet() const { return (_logger == 0 ? false : true); };
+ bool isLoggerSet() const { return _logger; };
void setProperties(PropertiesPtr properties) { _properties = properties; };
- bool isPropertiesSet() const { return (_properties == 0 ? false : true); };
+ bool isPropertiesSet() const { return _properties; };
protected:
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index f2c72cf817e..f58d23bc22d 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -1311,6 +1311,86 @@ InputPath=..\..\slice\Ice\PropertiesF.ice
# End Source File
# Begin Source File
+SOURCE=..\..\slice\Ice\Connection.ice
+
+!IF "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__PROPE="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\Connection.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Connection.ice \
+ move Connection.h ..\..\include\Ice \
+
+
+"..\..\include\Ice\Connection.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Connection.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__PROPE="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\Connection.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Connection.ice \
+ move Connection.h ..\..\include\Ice \
+
+
+"..\..\include\Ice\Connection.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Connection.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\Ice\ConnectionF.ice
+
+!IF "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__PROPER="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\ConnectionF.ice
+
+"..\..\include\Ice\ConnectionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/ConnectionF.ice
+ move ConnectionF.h ..\..\include\Ice
+ del ConnectionF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__PROPER="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\ConnectionF.ice
+
+"..\..\include\Ice\ConnectionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/ConnectionF.ice
+ move ConnectionF.h ..\..\include\Ice
+ del ConnectionF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\..\slice\Ice\SecurityException.ice
!IF "$(CFG)" == "Ice - Win32 Release"
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 361d097b238..7635a8d10b4 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -34,7 +34,9 @@ yyerror(const char* s)
%token ICE_INTERFACE
%token ICE_EXCEPTION
%token ICE_STRUCT
-%token ICE_LOCAL
+%token ICE_SEQUENCE
+%token ICE_DICTIONARY
+%token ICE_ENUM
%token ICE_EXTENDS
%token ICE_IMPLEMENTS
%token ICE_THROWS
@@ -50,9 +52,6 @@ yyerror(const char* s)
%token ICE_WSTRING
%token ICE_OBJECT
%token ICE_LOCAL_OBJECT
-%token ICE_SEQUENCE
-%token ICE_DICTIONARY
-%token ICE_ENUM
%token ICE_NONMUTATING
//
@@ -134,68 +133,33 @@ definition
;
// ----------------------------------------------------------------------
-class_exports
-// ----------------------------------------------------------------------
-: class_export ';' class_exports
-{
-}
-| error ';' class_exports
-{
-}
-| class_export
-{
- unit->error("`;' missing after definition");
-}
-|
-{
-}
-;
-
-// ----------------------------------------------------------------------
-class_export
-// ----------------------------------------------------------------------
-: operation
-{
-}
-| data_member
-{
-}
-;
-
-// ----------------------------------------------------------------------
-interface_exports
+module_def
// ----------------------------------------------------------------------
-: interface_export ';' interface_exports
-{
-}
-| error ';' interface_exports
-{
-}
-| interface_export
-{
- unit->error("`;' missing after definition");
-}
-|
+: ICE_MODULE ICE_IDENTIFIER
{
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
+ ContainerPtr cont = unit->currentContainer();
+ ModulePtr module = cont->createModule(ident->v);
+ if (!module)
+ {
+ YYERROR; // Can't continue, jump to next yyerrok
+ }
+ unit->pushContainer(module);
}
-;
-
-// ----------------------------------------------------------------------
-interface_export
-// ----------------------------------------------------------------------
-: operation
+'{' definitions '}'
{
+ unit->popContainer();
}
;
// ----------------------------------------------------------------------
exception_decl
// ----------------------------------------------------------------------
-: local ICE_EXCEPTION ICE_IDENTIFIER
+: ICE_EXCEPTION ICE_IDENTIFIER
{
unit->error("exceptions cannot be forward declared");
}
-| local ICE_EXCEPTION keyword
+| ICE_EXCEPTION keyword
{
unit->error("keyword cannot be used as exception name");
}
@@ -204,13 +168,13 @@ exception_decl
// ----------------------------------------------------------------------
exception_def
// ----------------------------------------------------------------------
-: local ICE_EXCEPTION ICE_IDENTIFIER exception_extends
+: ICE_EXCEPTION ICE_IDENTIFIER exception_extends
{
BoolTokPtr local = BoolTokPtr::dynamicCast($1);
- StringTokPtr ident = StringTokPtr::dynamicCast($3);
- ExceptionPtr base = ExceptionPtr::dynamicCast($4);
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
+ ExceptionPtr base = ExceptionPtr::dynamicCast($3);
ContainerPtr cont = unit->currentContainer();
- ExceptionPtr ex = cont->createException(ident->v, local->v, base);
+ ExceptionPtr ex = cont->createException(ident->v, base, local->v);
if (!ex)
{
YYERROR; // Can't continue, jump to next yyerrok
@@ -221,7 +185,7 @@ exception_def
{
unit->popContainer();
}
-| local ICE_EXCEPTION keyword exception_extends
+| ICE_EXCEPTION keyword exception_extends
{
unit->error("keyword cannot be used as exception name");
}
@@ -289,9 +253,10 @@ struct_def
// ----------------------------------------------------------------------
: ICE_STRUCT ICE_IDENTIFIER
{
+ BoolTokPtr local = BoolTokPtr::dynamicCast($1);
StringTokPtr ident = StringTokPtr::dynamicCast($2);
ContainerPtr cont = unit->currentContainer();
- StructPtr st = cont->createStruct(ident->v);
+ StructPtr st = cont->createStruct(ident->v, local->v);
if (!st)
{
YYERROR; // Can't continue, jump to next yyerrok
@@ -338,53 +303,16 @@ struct_export
;
// ----------------------------------------------------------------------
-module_def
-// ----------------------------------------------------------------------
-: ICE_MODULE ICE_IDENTIFIER
-{
- StringTokPtr ident = StringTokPtr::dynamicCast($2);
- ContainerPtr cont = unit->currentContainer();
- ModulePtr module = cont->createModule(ident->v);
- if (!module)
- {
- YYERROR; // Can't continue, jump to next yyerrok
- }
- unit->pushContainer(module);
-}
-'{' definitions '}'
-{
- unit->popContainer();
-}
-;
-
-// ----------------------------------------------------------------------
-local
-// ----------------------------------------------------------------------
-: ICE_LOCAL
-{
- BoolTokPtr local = new BoolTok;
- local->v = true;
- $$ = local;
-}
-|
-{
- BoolTokPtr local = new BoolTok;
- local->v = false;
- $$ = local;
-}
-;
-
-// ----------------------------------------------------------------------
class_decl
// ----------------------------------------------------------------------
-: local ICE_CLASS ICE_IDENTIFIER
+: ICE_CLASS ICE_IDENTIFIER
{
BoolTokPtr local = BoolTokPtr::dynamicCast($1);
- StringTokPtr ident = StringTokPtr::dynamicCast($3);
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
ContainerPtr cont = unit->currentContainer();
- ClassDeclPtr cl = cont->createClassDecl(ident->v, local->v, false);
+ ClassDeclPtr cl = cont->createClassDecl(ident->v, false, local->v);
}
-| local ICE_CLASS keyword
+| ICE_CLASS keyword
{
unit->error("keyword cannot be used as class name");
}
@@ -393,18 +321,18 @@ class_decl
// ----------------------------------------------------------------------
class_def
// ----------------------------------------------------------------------
-: local ICE_CLASS ICE_IDENTIFIER class_extends implements
+: ICE_CLASS ICE_IDENTIFIER class_extends implements
{
BoolTokPtr local = BoolTokPtr::dynamicCast($1);
- StringTokPtr ident = StringTokPtr::dynamicCast($3);
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
ContainerPtr cont = unit->currentContainer();
- ClassDefPtr base = ClassDefPtr::dynamicCast($4);
- ClassListTokPtr bases = ClassListTokPtr::dynamicCast($5);
+ ClassDefPtr base = ClassDefPtr::dynamicCast($3);
+ ClassListTokPtr bases = ClassListTokPtr::dynamicCast($4);
if (base)
{
bases->v.push_front(base);
}
- ClassDefPtr cl = cont->createClassDef(ident->v, local->v, false, bases->v);
+ ClassDefPtr cl = cont->createClassDef(ident->v, false, bases->v, local->v);
if (!cl)
{
YYERROR; // Can't continue, jump to next yyerrok
@@ -415,7 +343,7 @@ class_def
{
unit->popContainer();
}
-| local ICE_CLASS keyword class_extends implements
+| ICE_CLASS keyword class_extends implements
{
unit->error("keyword cannot be used as class name");
}
@@ -480,16 +408,45 @@ implements
;
// ----------------------------------------------------------------------
+class_exports
+// ----------------------------------------------------------------------
+: class_export ';' class_exports
+{
+}
+| error ';' class_exports
+{
+}
+| class_export
+{
+ unit->error("`;' missing after definition");
+}
+|
+{
+}
+;
+
+// ----------------------------------------------------------------------
+class_export
+// ----------------------------------------------------------------------
+: operation
+{
+}
+| data_member
+{
+}
+;
+
+// ----------------------------------------------------------------------
interface_decl
// ----------------------------------------------------------------------
-: local ICE_INTERFACE ICE_IDENTIFIER
+: ICE_INTERFACE ICE_IDENTIFIER
{
BoolTokPtr local = BoolTokPtr::dynamicCast($1);
- StringTokPtr ident = StringTokPtr::dynamicCast($3);
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
ContainerPtr cont = unit->currentContainer();
- ClassDeclPtr cl = cont->createClassDecl(ident->v, local->v, true);
+ ClassDeclPtr cl = cont->createClassDecl(ident->v, true, local->v);
}
-| local ICE_INTERFACE keyword
+| ICE_INTERFACE keyword
{
unit->error("keyword cannot be used as interface name");
}
@@ -498,13 +455,13 @@ interface_decl
// ----------------------------------------------------------------------
interface_def
// ----------------------------------------------------------------------
-: local ICE_INTERFACE ICE_IDENTIFIER interface_extends
+: ICE_INTERFACE ICE_IDENTIFIER interface_extends
{
BoolTokPtr local = BoolTokPtr::dynamicCast($1);
- StringTokPtr ident = StringTokPtr::dynamicCast($3);
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
ContainerPtr cont = unit->currentContainer();
- ClassListTokPtr bases = ClassListTokPtr::dynamicCast($4);
- ClassDefPtr cl = cont->createClassDef(ident->v, local->v, true, bases->v);
+ ClassListTokPtr bases = ClassListTokPtr::dynamicCast($3);
+ ClassDefPtr cl = cont->createClassDef(ident->v, true, bases->v, local->v);
if (!cl)
{
YYERROR; // Can't continue, jump to next yyerrok
@@ -515,7 +472,7 @@ interface_def
{
unit->popContainer();
}
-| local ICE_INTERFACE keyword interface_extends
+| ICE_INTERFACE keyword interface_extends
{
unit->error("keyword cannot be used as interface name");
}
@@ -611,6 +568,170 @@ interface_extends
;
// ----------------------------------------------------------------------
+interface_exports
+// ----------------------------------------------------------------------
+: interface_export ';' interface_exports
+{
+}
+| error ';' interface_exports
+{
+}
+| interface_export
+{
+ unit->error("`;' missing after definition");
+}
+|
+{
+}
+;
+
+// ----------------------------------------------------------------------
+interface_export
+// ----------------------------------------------------------------------
+: operation
+{
+}
+;
+
+// ----------------------------------------------------------------------
+exception_list
+// ----------------------------------------------------------------------
+: exception ',' exception_list
+{
+ ExceptionPtr exception = ExceptionPtr::dynamicCast($1);
+ ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast($3);
+ exceptionList->v.push_front(exception);
+ $$ = exceptionList;
+}
+| exception
+{
+ ExceptionPtr exception = ExceptionPtr::dynamicCast($1);
+ ExceptionListTokPtr exceptionList = new ExceptionListTok;
+ exceptionList->v.push_front(exception);
+ $$ = exceptionList;
+}
+;
+
+// ----------------------------------------------------------------------
+exception
+// ----------------------------------------------------------------------
+/* TODO: builtin exceptions "Exception" and "LocalException"*/
+: scoped_name
+{
+ StringTokPtr scoped = StringTokPtr::dynamicCast($1);
+ ContainerPtr cont = unit->currentContainer();
+ ExceptionPtr exception = cont->lookupException(scoped->v);
+ if (!exception)
+ {
+ YYERROR; // Can't continue, jump to next yyerrok
+ }
+ $$ = exception;
+}
+;
+
+// ----------------------------------------------------------------------
+sequence_def
+// ----------------------------------------------------------------------
+: ICE_SEQUENCE '<' type '>' ICE_IDENTIFIER
+{
+ BoolTokPtr local = BoolTokPtr::dynamicCast($1);
+ StringTokPtr ident = StringTokPtr::dynamicCast($5);
+ TypePtr type = TypePtr::dynamicCast($3);
+ ContainerPtr cont = unit->currentContainer();
+ cont->createSequence(ident->v, type, local->v);
+}
+| ICE_SEQUENCE '<' type '>' keyword
+{
+ unit->error("keyword cannot be used as sequence name");
+}
+;
+
+// ----------------------------------------------------------------------
+dictionary_def
+// ----------------------------------------------------------------------
+: ICE_DICTIONARY '<' type ',' type '>' ICE_IDENTIFIER
+{
+ BoolTokPtr local = BoolTokPtr::dynamicCast($1);
+ StringTokPtr ident = StringTokPtr::dynamicCast($7);
+ TypePtr keyType = TypePtr::dynamicCast($3);
+ TypePtr valueType = TypePtr::dynamicCast($5);
+ ContainerPtr cont = unit->currentContainer();
+ cont->createDictionary(ident->v, keyType, valueType, local->v);
+}
+| ICE_DICTIONARY '<' type ',' type '>' keyword
+{
+ unit->error("keyword cannot be used as dictionary name");
+}
+;
+
+// ----------------------------------------------------------------------
+enum_def
+// ----------------------------------------------------------------------
+: ICE_ENUM ICE_IDENTIFIER
+{
+ BoolTokPtr local = BoolTokPtr::dynamicCast($1);
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
+ ContainerPtr cont = unit->currentContainer();
+ EnumPtr en = cont->createEnum(ident->v, local->v);
+ $$ = en;
+}
+'{' enumerator_list '}'
+{
+ EnumPtr en = EnumPtr::dynamicCast($3);
+ if (en)
+ {
+ EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5);
+ en->setEnumerators(enumerators->v);
+ }
+}
+| ICE_ENUM keyword
+{
+ unit->error("keyword cannot be used as enum name");
+}
+'{' enumerator_list '}'
+{
+}
+;
+
+// ----------------------------------------------------------------------
+enumerator_list
+// ----------------------------------------------------------------------
+: enumerator ',' enumerator_list
+{
+ EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast($1);
+ ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast($3)->v);
+ $$ = ens;
+}
+| enumerator
+{
+ $$ = $1;
+}
+;
+
+// ----------------------------------------------------------------------
+enumerator
+// ----------------------------------------------------------------------
+: ICE_IDENTIFIER
+{
+ StringTokPtr ident = StringTokPtr::dynamicCast($1);
+ EnumeratorListTokPtr ens = new EnumeratorListTok;
+ $$ = ens;
+ ContainerPtr cont = unit->currentContainer();
+ EnumeratorPtr en = cont->createEnumerator(ident->v);
+ if (en)
+ {
+ ens->v.push_front(en);
+ }
+}
+| keyword
+{
+ unit->error("keyword cannot be used as enumerator");
+ EnumeratorListTokPtr ens = new EnumeratorListTok;
+ $$ = ens;
+}
+;
+
+// ----------------------------------------------------------------------
operation
// ----------------------------------------------------------------------
: return_type ICE_OP_IDENTIFIER parameters output_parameters ')' throws
@@ -749,6 +870,29 @@ data_member
;
// ----------------------------------------------------------------------
+scoped_name
+// ----------------------------------------------------------------------
+: ICE_IDENTIFIER
+{
+ $$ = $1;
+}
+| ICE_SCOPE_DELIMITOR ICE_IDENTIFIER
+{
+ StringTokPtr ident = StringTokPtr::dynamicCast($2);
+ ident->v = "::" + ident->v;
+ $$ = ident;
+}
+| scoped_name ICE_SCOPE_DELIMITOR ICE_IDENTIFIER
+{
+ StringTokPtr scoped = StringTokPtr::dynamicCast($1);
+ StringTokPtr ident = StringTokPtr::dynamicCast($3);
+ scoped->v += "::";
+ scoped->v += ident->v;
+ $$ = scoped;
+}
+;
+
+// ----------------------------------------------------------------------
type
// ----------------------------------------------------------------------
: ICE_BYTE
@@ -850,164 +994,6 @@ return_type
;
// ----------------------------------------------------------------------
-exception_list
-// ----------------------------------------------------------------------
-: exception ',' exception_list
-{
- ExceptionPtr exception = ExceptionPtr::dynamicCast($1);
- ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast($3);
- exceptionList->v.push_front(exception);
- $$ = exceptionList;
-}
-| exception
-{
- ExceptionPtr exception = ExceptionPtr::dynamicCast($1);
- ExceptionListTokPtr exceptionList = new ExceptionListTok;
- exceptionList->v.push_front(exception);
- $$ = exceptionList;
-}
-;
-
-// ----------------------------------------------------------------------
-exception
-// ----------------------------------------------------------------------
-/* TODO: builtin exceptions "Exception" and "LocalException"*/
-: scoped_name
-{
- StringTokPtr scoped = StringTokPtr::dynamicCast($1);
- ContainerPtr cont = unit->currentContainer();
- ExceptionPtr exception = cont->lookupException(scoped->v);
- if (!exception)
- {
- YYERROR; // Can't continue, jump to next yyerrok
- }
- $$ = exception;
-}
-;
-
-// ----------------------------------------------------------------------
-sequence_def
-// ----------------------------------------------------------------------
-: ICE_SEQUENCE '<' type '>' ICE_IDENTIFIER
-{
- StringTokPtr ident = StringTokPtr::dynamicCast($5);
- TypePtr type = TypePtr::dynamicCast($3);
- ContainerPtr cont = unit->currentContainer();
- cont->createSequence(ident->v, type);
-}
-| ICE_SEQUENCE '<' type '>' keyword
-{
- unit->error("keyword cannot be used as sequence name");
-}
-;
-
-// ----------------------------------------------------------------------
-dictionary_def
-// ----------------------------------------------------------------------
-: ICE_DICTIONARY '<' type ',' type '>' ICE_IDENTIFIER
-{
- StringTokPtr ident = StringTokPtr::dynamicCast($7);
- TypePtr keyType = TypePtr::dynamicCast($3);
- TypePtr valueType = TypePtr::dynamicCast($5);
- ContainerPtr cont = unit->currentContainer();
- cont->createDictionary(ident->v, keyType, valueType);
-}
-| ICE_DICTIONARY '<' type ',' type '>' keyword
-{
- unit->error("keyword cannot be used as dictionary name");
-}
-;
-
-// ----------------------------------------------------------------------
-enum_def
-// ----------------------------------------------------------------------
-: ICE_ENUM ICE_IDENTIFIER
-{
- StringTokPtr ident = StringTokPtr::dynamicCast($2);
- ContainerPtr cont = unit->currentContainer();
- EnumPtr en = cont->createEnum(ident->v);
- $$ = en;
-}
-'{' enumerator_list '}'
-{
- EnumPtr en = EnumPtr::dynamicCast($3);
- if (en)
- {
- EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5);
- en->setEnumerators(enumerators->v);
- }
-}
-| ICE_ENUM keyword
-{
- unit->error("keyword cannot be used as enum name");
-}
-'{' enumerator_list '}'
-{
-}
-;
-
-// ----------------------------------------------------------------------
-enumerator_list
-// ----------------------------------------------------------------------
-: enumerator ',' enumerator_list
-{
- EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast($1);
- ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast($3)->v);
- $$ = ens;
-}
-| enumerator
-{
- $$ = $1;
-}
-;
-
-// ----------------------------------------------------------------------
-enumerator
-// ----------------------------------------------------------------------
-: ICE_IDENTIFIER
-{
- StringTokPtr ident = StringTokPtr::dynamicCast($1);
- EnumeratorListTokPtr ens = new EnumeratorListTok;
- $$ = ens;
- ContainerPtr cont = unit->currentContainer();
- EnumeratorPtr en = cont->createEnumerator(ident->v);
- if (en)
- {
- ens->v.push_front(en);
- }
-}
-| keyword
-{
- unit->error("keyword cannot be used as enumerator");
- EnumeratorListTokPtr ens = new EnumeratorListTok;
- $$ = ens;
-}
-;
-
-// ----------------------------------------------------------------------
-scoped_name
-// ----------------------------------------------------------------------
-: ICE_IDENTIFIER
-{
- $$ = $1;
-}
-| ICE_SCOPE_DELIMITOR ICE_IDENTIFIER
-{
- StringTokPtr ident = StringTokPtr::dynamicCast($2);
- ident->v = "::" + ident->v;
- $$ = ident;
-}
-| scoped_name ICE_SCOPE_DELIMITOR ICE_IDENTIFIER
-{
- StringTokPtr scoped = StringTokPtr::dynamicCast($1);
- StringTokPtr ident = StringTokPtr::dynamicCast($3);
- scoped->v += "::";
- scoped->v += ident->v;
- $$ = scoped;
-}
-;
-
-// ----------------------------------------------------------------------
keyword
// ----------------------------------------------------------------------
: ICE_MODULE
@@ -1025,9 +1011,6 @@ keyword
| ICE_STRUCT
{
}
-| ICE_LOCAL
-{
-}
| ICE_EXTENDS
{
}
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index b9489111101..ef93d6d5f2b 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -181,7 +181,7 @@ Slice::Container::createModule(const string& name)
}
ClassDefPtr
-Slice::Container::createClassDef(const string& name, bool local, bool intf, const ClassList& bases)
+Slice::Container::createClassDef(const string& name, bool intf, const ClassList& bases, bool local)
{
ContainedList matches = _unit->findContents(thisScope() + name);
for (ContainedList::const_iterator p = matches.begin(); p != matches.end(); ++p)
@@ -237,7 +237,7 @@ Slice::Container::createClassDef(const string& name, bool local, bool intf, cons
return 0;
}
- ClassDefPtr def = new ClassDef(this, name, local, intf, bases);
+ ClassDefPtr def = new ClassDef(this, name, intf, bases, local);
_contents.push_back(def);
for (ContainedList::const_iterator q = matches.begin(); q != matches.end(); ++q)
@@ -251,14 +251,14 @@ Slice::Container::createClassDef(const string& name, bool local, bool intf, cons
// definition. This way the code generator can rely on always
// having a class declaration available for lookup.
//
- ClassDeclPtr decl = createClassDecl(name, local, intf);
+ ClassDeclPtr decl = createClassDecl(name, intf, local);
def->_declaration = decl;
return def;
}
ClassDeclPtr
-Slice::Container::createClassDecl(const string& name, bool local, bool intf)
+Slice::Container::createClassDecl(const string& name, bool intf, bool local)
{
ClassDefPtr def;
@@ -323,7 +323,7 @@ Slice::Container::createClassDecl(const string& name, bool local, bool intf)
}
}
- ClassDeclPtr decl = new ClassDecl(this, name, local, intf);
+ ClassDeclPtr decl = new ClassDecl(this, name, intf, local);
_contents.push_back(decl);
if (def)
@@ -335,7 +335,7 @@ Slice::Container::createClassDecl(const string& name, bool local, bool intf)
}
ExceptionPtr
-Slice::Container::createException(const string& name, bool local, const ExceptionPtr& base)
+Slice::Container::createException(const string& name, const ExceptionPtr& base, bool local)
{
ContainedList matches = _unit->findContents(thisScope() + name);
if (!matches.empty())
@@ -363,13 +363,13 @@ Slice::Container::createException(const string& name, bool local, const Exceptio
return 0;
}
- ExceptionPtr p = new Exception(this, name, local, base);
+ ExceptionPtr p = new Exception(this, name, base, local);
_contents.push_back(p);
return p;
}
StructPtr
-Slice::Container::createStruct(const string& name)
+Slice::Container::createStruct(const string& name, bool local)
{
ContainedList matches = _unit->findContents(thisScope() + name);
if (!matches.empty())
@@ -397,13 +397,13 @@ Slice::Container::createStruct(const string& name)
return 0;
}
- StructPtr p = new Struct(this, name);
+ StructPtr p = new Struct(this, name, local);
_contents.push_back(p);
return p;
}
SequencePtr
-Slice::Container::createSequence(const string& name, const TypePtr& type)
+Slice::Container::createSequence(const string& name, const TypePtr& type, bool local)
{
ContainedList matches = _unit->findContents(thisScope() + name);
if (!matches.empty())
@@ -430,13 +430,13 @@ Slice::Container::createSequence(const string& name, const TypePtr& type)
return 0;
}
- SequencePtr p = new Sequence(this, name, type);
+ SequencePtr p = new Sequence(this, name, type, local);
_contents.push_back(p);
return p;
}
DictionaryPtr
-Slice::Container::createDictionary(const string& name, const TypePtr& keyType, const TypePtr& valueType)
+Slice::Container::createDictionary(const string& name, const TypePtr& keyType, const TypePtr& valueType, bool local)
{
ContainedList matches = _unit->findContents(thisScope() + name);
if (!matches.empty())
@@ -463,13 +463,13 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c
return 0;
}
- DictionaryPtr p = new Dictionary(this, name, keyType, valueType);
+ DictionaryPtr p = new Dictionary(this, name, keyType, valueType, local);
_contents.push_back(p);
return p;
}
EnumPtr
-Slice::Container::createEnum(const string& name)
+Slice::Container::createEnum(const string& name, bool local)
{
ContainedList matches = _unit->findContents(thisScope() + name);
if (!matches.empty())
@@ -496,7 +496,7 @@ Slice::Container::createEnum(const string& name)
return 0;
}
- EnumPtr p = new Enum(this, name);
+ EnumPtr p = new Enum(this, name, local);
_contents.push_back(p);
return p;
}
@@ -1071,18 +1071,18 @@ Slice::Container::checkInterfaceAndLocal(const string& name, bool defined,
// Module
// ----------------------------------------------------------------------
-bool
-Slice::Module::uses(const ConstructedPtr&)
-{
- return false;
-}
-
Contained::ContainedType
Slice::Module::containedType()
{
return ContainedTypeModule;
}
+bool
+Slice::Module::uses(const ConstructedPtr&)
+{
+ return false;
+}
+
void
Slice::Module::visit(ParserVisitor* visitor)
{
@@ -1109,10 +1109,17 @@ Slice::Module::Module(const ContainerPtr& container, const string& name) :
// Constructed
// ----------------------------------------------------------------------
-Slice::Constructed::Constructed(const ContainerPtr& container, const string& name) :
+bool
+Slice::Constructed::isLocal()
+{
+ return _local;
+}
+
+Slice::Constructed::Constructed(const ContainerPtr& container, const string& name, bool local) :
Type(container->unit()),
Contained(container, name),
- SyntaxTreeBase(container->unit())
+ SyntaxTreeBase(container->unit()),
+ _local(local)
{
}
@@ -1134,15 +1141,15 @@ Slice::ClassDecl::definition()
}
bool
-Slice::ClassDecl::isLocal()
+Slice::ClassDecl::isInterface()
{
- return _local;
+ return _interface;
}
-bool
-Slice::ClassDecl::isInterface()
+Contained::ContainedType
+Slice::ClassDecl::containedType()
{
- return _interface;
+ return ContainedTypeClass;
}
bool
@@ -1151,24 +1158,17 @@ Slice::ClassDecl::uses(const ConstructedPtr& constructed)
return false;
}
-Contained::ContainedType
-Slice::ClassDecl::containedType()
-{
- return ContainedTypeClass;
-}
-
void
Slice::ClassDecl::visit(ParserVisitor* visitor)
{
visitor->visitClassDecl(this);
}
-Slice::ClassDecl::ClassDecl(const ContainerPtr& container, const string& name, bool local, bool intf) :
- Constructed(container, name),
+Slice::ClassDecl::ClassDecl(const ContainerPtr& container, const string& name, bool intf, bool local) :
+ Constructed(container, name, local),
Type(container->unit()),
Contained(container, name),
SyntaxTreeBase(container->unit()),
- _local(local),
_interface(intf)
{
}
@@ -1416,27 +1416,21 @@ Slice::ClassDef::isAbstract()
}
bool
-Slice::ClassDef::isLocal()
-{
- return _local;
-}
-
-bool
Slice::ClassDef::isInterface()
{
return _interface;
}
bool
-Slice::ClassDef::hasDataMembers()
+Slice::ClassDef::isLocal()
{
- return _hasDataMembers;
+ return _local;
}
bool
-Slice::ClassDef::uses(const ConstructedPtr&)
+Slice::ClassDef::hasDataMembers()
{
- return false;
+ return _hasDataMembers;
}
Contained::ContainedType
@@ -1445,6 +1439,12 @@ Slice::ClassDef::containedType()
return ContainedTypeClass;
}
+bool
+Slice::ClassDef::uses(const ConstructedPtr&)
+{
+ return false;
+}
+
void
Slice::ClassDef::visit(ParserVisitor* visitor)
{
@@ -1460,15 +1460,15 @@ Slice::ClassDef::visit(ParserVisitor* visitor)
}
}
-Slice::ClassDef::ClassDef(const ContainerPtr& container, const string& name, bool local, bool intf,
- const ClassList& bases) :
+Slice::ClassDef::ClassDef(const ContainerPtr& container, const string& name, bool intf, const ClassList& bases,
+ bool local) :
Contained(container, name),
Container(container->unit()),
SyntaxTreeBase(container->unit()),
- _local(local),
_interface(intf),
_hasDataMembers(false),
- _bases(bases)
+ _bases(bases),
+ _local(local)
{
//
// First element of bases may be a class, all others must be
@@ -1591,18 +1591,18 @@ Slice::Exception::isLocal()
return _local;
}
-bool
-Slice::Exception::uses(const ConstructedPtr&)
-{
- return false;
-}
-
Contained::ContainedType
Slice::Exception::containedType()
{
return ContainedTypeException;
}
+bool
+Slice::Exception::uses(const ConstructedPtr&)
+{
+ return false;
+}
+
void
Slice::Exception::visit(ParserVisitor* visitor)
{
@@ -1618,12 +1618,12 @@ Slice::Exception::visit(ParserVisitor* visitor)
}
}
-Slice::Exception::Exception(const ContainerPtr& container, const string& name, bool local, const ExceptionPtr& base) :
+Slice::Exception::Exception(const ContainerPtr& container, const string& name, const ExceptionPtr& base, bool local) :
Container(container->unit()),
Contained(container, name),
SyntaxTreeBase(container->unit()),
- _local(local),
- _base(base)
+ _base(base),
+ _local(local)
{
}
@@ -1697,18 +1697,18 @@ Slice::Struct::dataMembers()
return result;
}
-bool
-Slice::Struct::uses(const ConstructedPtr&)
-{
- return false;
-}
-
Contained::ContainedType
Slice::Struct::containedType()
{
return ContainedTypeStruct;
}
+bool
+Slice::Struct::uses(const ConstructedPtr&)
+{
+ return false;
+}
+
void
Slice::Struct::visit(ParserVisitor* visitor)
{
@@ -1724,9 +1724,9 @@ Slice::Struct::visit(ParserVisitor* visitor)
}
}
-Slice::Struct::Struct(const ContainerPtr& container, const string& name) :
+Slice::Struct::Struct(const ContainerPtr& container, const string& name, bool local) :
Container(container->unit()),
- Constructed(container, name),
+ Constructed(container, name, local),
Type(container->unit()),
Contained(container, name),
SyntaxTreeBase(container->unit())
@@ -1734,75 +1734,83 @@ Slice::Struct::Struct(const ContainerPtr& container, const string& name) :
}
// ----------------------------------------------------------------------
-// Operation
+// Sequence
// ----------------------------------------------------------------------
TypePtr
-Slice::Operation::returnType()
+Slice::Sequence::type()
{
- return _returnType;
+ return _type;
}
-TypeStringList
-Slice::Operation::inputParameters()
+Contained::ContainedType
+Slice::Sequence::containedType()
{
- return _inParams;
+ return ContainedTypeSequence;
}
-TypeStringList
-Slice::Operation::outputParameters()
+bool
+Slice::Sequence::uses(const ConstructedPtr& constructed)
{
- return _outParams;
+ ContainedPtr contained = ContainedPtr::dynamicCast(_type);
+ if (contained && contained == constructed)
+ {
+ return true;
+ }
+
+ return false;
}
-ExceptionList
-Slice::Operation::throws()
+void
+Slice::Sequence::visit(ParserVisitor* visitor)
{
- return _throws;
+ visitor->visitSequence(this);
}
-bool
-Slice::Operation::nonmutating()
+Slice::Sequence::Sequence(const ContainerPtr& container, const string& name, const TypePtr& type, bool local) :
+ Constructed(container, name, local),
+ Type(container->unit()),
+ Contained(container, name),
+ SyntaxTreeBase(container->unit()),
+ _type(type)
{
- return _nonmutating;
}
-bool
-Slice::Operation::uses(const ConstructedPtr& constructed)
+// ----------------------------------------------------------------------
+// Dictionary
+// ----------------------------------------------------------------------
+
+TypePtr
+Slice::Dictionary::keyType()
{
- {
- ContainedPtr contained = ContainedPtr::dynamicCast(_returnType);
- if (contained && contained == constructed)
- {
- return true;
- }
- }
+ return _keyType;
+}
- TypeStringList::const_iterator p;
+TypePtr
+Slice::Dictionary::valueType()
+{
+ return _valueType;
+}
- for (p = _inParams.begin(); p != _inParams.end(); ++p)
- {
- ContainedPtr contained = ContainedPtr::dynamicCast(p->first);
- if (contained && contained == constructed)
- {
- return true;
- }
- }
+Contained::ContainedType
+Slice::Dictionary::containedType()
+{
+ return ContainedTypeDictionary;
+}
- for (p = _outParams.begin(); p != _outParams.end(); ++p)
+bool
+Slice::Dictionary::uses(const ConstructedPtr& constructed)
+{
{
- ContainedPtr contained = ContainedPtr::dynamicCast(p->first);
+ ContainedPtr contained = ContainedPtr::dynamicCast(_keyType);
if (contained && contained == constructed)
{
return true;
}
}
- ExceptionList::const_iterator q;
-
- for (q = _throws.begin(); q != _throws.end(); ++q)
{
- ContainedPtr contained = ContainedPtr::dynamicCast(*q);
+ ContainedPtr contained = ContainedPtr::dynamicCast(_valueType);
if (contained && contained == constructed)
{
return true;
@@ -1812,237 +1820,229 @@ Slice::Operation::uses(const ConstructedPtr& constructed)
return false;
}
-Contained::ContainedType
-Slice::Operation::containedType()
-{
- return ContainedTypeOperation;
-}
-
void
-Slice::Operation::visit(ParserVisitor* visitor)
+Slice::Dictionary::visit(ParserVisitor* visitor)
{
- visitor->visitOperation(this);
+ visitor->visitDictionary(this);
}
-Slice::Operation::Operation(const ContainerPtr& container, const string& name, const TypePtr& returnType,
- const TypeStringList& inParams, const TypeStringList& outParams,
- const ExceptionList& throws, bool nonmutating) :
+Slice::Dictionary::Dictionary(const ContainerPtr& container, const string& name, const TypePtr& keyType,
+ const TypePtr& valueType, bool local) :
+ Constructed(container, name, local),
+ Type(container->unit()),
Contained(container, name),
SyntaxTreeBase(container->unit()),
- _returnType(returnType),
- _inParams(inParams),
- _outParams(outParams),
- _throws(throws),
- _nonmutating(nonmutating)
+ _keyType(keyType),
+ _valueType(valueType)
{
}
// ----------------------------------------------------------------------
-// DataMember
+// Enum
// ----------------------------------------------------------------------
-TypePtr
-Slice::DataMember::type()
+EnumeratorList
+Slice::Enum::getEnumerators()
{
- return _type;
+ return _enumerators;
}
-bool
-Slice::DataMember::uses(const ConstructedPtr& constructed)
+void
+Slice::Enum::setEnumerators(const EnumeratorList& ens)
{
- ContainedPtr contained = ContainedPtr::dynamicCast(_type);
- if (contained && contained == constructed)
- {
- return true;
- }
-
- return false;
+ _enumerators = ens;
}
Contained::ContainedType
-Slice::DataMember::containedType()
+Slice::Enum::containedType()
{
- return ContainedTypeDataMember;
+ return ContainedTypeEnum;
+}
+
+bool
+Slice::Enum::uses(const ConstructedPtr& constructed)
+{
+ return false;
}
void
-Slice::DataMember::visit(ParserVisitor* visitor)
+Slice::Enum::visit(ParserVisitor* visitor)
{
- visitor->visitDataMember(this);
+ visitor->visitEnum(this);
}
-Slice::DataMember::DataMember(const ContainerPtr& container, const string& name, const TypePtr& type) :
+Slice::Enum::Enum(const ContainerPtr& container, const string& name, bool local) :
+ Constructed(container, name, local),
+ Type(container->unit()),
Contained(container, name),
- SyntaxTreeBase(container->unit()),
- _type(type)
+ SyntaxTreeBase(container->unit())
{
}
// ----------------------------------------------------------------------
-// Sequence
+// Enumerator
// ----------------------------------------------------------------------
-TypePtr
-Slice::Sequence::type()
+Contained::ContainedType
+Slice::Enumerator::containedType()
{
- return _type;
+ return ContainedTypeEnumerator;
}
bool
-Slice::Sequence::uses(const ConstructedPtr& constructed)
+Slice::Enumerator::uses(const ConstructedPtr& constructed)
{
- ContainedPtr contained = ContainedPtr::dynamicCast(_type);
- if (contained && contained == constructed)
- {
- return true;
- }
-
return false;
}
-Contained::ContainedType
-Slice::Sequence::containedType()
+Slice::Enumerator::Enumerator(const ContainerPtr& container, const string& name) :
+ Contained(container, name),
+ SyntaxTreeBase(container->unit())
{
- return ContainedTypeSequence;
}
-void
-Slice::Sequence::visit(ParserVisitor* visitor)
+// ----------------------------------------------------------------------
+// Operation
+// ----------------------------------------------------------------------
+
+TypePtr
+Slice::Operation::returnType()
{
- visitor->visitSequence(this);
+ return _returnType;
}
-Slice::Sequence::Sequence(const ContainerPtr& container, const string& name, const TypePtr& type) :
- Constructed(container, name),
- Type(container->unit()),
- Contained(container, name),
- SyntaxTreeBase(container->unit()),
- _type(type)
+TypeStringList
+Slice::Operation::inputParameters()
{
+ return _inParams;
}
-// ----------------------------------------------------------------------
-// Dictionary
-// ----------------------------------------------------------------------
+TypeStringList
+Slice::Operation::outputParameters()
+{
+ return _outParams;
+}
-TypePtr
-Slice::Dictionary::keyType()
+ExceptionList
+Slice::Operation::throws()
{
- return _keyType;
+ return _throws;
}
-TypePtr
-Slice::Dictionary::valueType()
+bool
+Slice::Operation::nonmutating()
{
- return _valueType;
+ return _nonmutating;
+}
+
+Contained::ContainedType
+Slice::Operation::containedType()
+{
+ return ContainedTypeOperation;
}
bool
-Slice::Dictionary::uses(const ConstructedPtr& constructed)
+Slice::Operation::uses(const ConstructedPtr& constructed)
{
{
- ContainedPtr contained = ContainedPtr::dynamicCast(_keyType);
+ ContainedPtr contained = ContainedPtr::dynamicCast(_returnType);
if (contained && contained == constructed)
{
return true;
}
}
+ TypeStringList::const_iterator p;
+
+ for (p = _inParams.begin(); p != _inParams.end(); ++p)
{
- ContainedPtr contained = ContainedPtr::dynamicCast(_valueType);
+ ContainedPtr contained = ContainedPtr::dynamicCast(p->first);
if (contained && contained == constructed)
{
return true;
}
}
- return false;
-}
+ for (p = _outParams.begin(); p != _outParams.end(); ++p)
+ {
+ ContainedPtr contained = ContainedPtr::dynamicCast(p->first);
+ if (contained && contained == constructed)
+ {
+ return true;
+ }
+ }
-Contained::ContainedType
-Slice::Dictionary::containedType()
-{
- return ContainedTypeDictionary;
+ ExceptionList::const_iterator q;
+
+ for (q = _throws.begin(); q != _throws.end(); ++q)
+ {
+ ContainedPtr contained = ContainedPtr::dynamicCast(*q);
+ if (contained && contained == constructed)
+ {
+ return true;
+ }
+ }
+
+ return false;
}
void
-Slice::Dictionary::visit(ParserVisitor* visitor)
+Slice::Operation::visit(ParserVisitor* visitor)
{
- visitor->visitDictionary(this);
+ visitor->visitOperation(this);
}
-Slice::Dictionary::Dictionary(const ContainerPtr& container, const string& name, const TypePtr& keyType,
- const TypePtr& valueType) :
- Constructed(container, name),
- Type(container->unit()),
+Slice::Operation::Operation(const ContainerPtr& container, const string& name, const TypePtr& returnType,
+ const TypeStringList& inParams, const TypeStringList& outParams,
+ const ExceptionList& throws, bool nonmutating) :
Contained(container, name),
SyntaxTreeBase(container->unit()),
- _keyType(keyType),
- _valueType(valueType)
+ _returnType(returnType),
+ _inParams(inParams),
+ _outParams(outParams),
+ _throws(throws),
+ _nonmutating(nonmutating)
{
}
// ----------------------------------------------------------------------
-// Enum
+// DataMember
// ----------------------------------------------------------------------
-EnumeratorList
-Slice::Enum::getEnumerators()
-{
- return _enumerators;
-}
-
-void
-Slice::Enum::setEnumerators(const EnumeratorList& ens)
-{
- _enumerators = ens;
-}
-
-bool
-Slice::Enum::uses(const ConstructedPtr& constructed)
+TypePtr
+Slice::DataMember::type()
{
- return false;
+ return _type;
}
Contained::ContainedType
-Slice::Enum::containedType()
-{
- return ContainedTypeEnum;
-}
-
-void
-Slice::Enum::visit(ParserVisitor* visitor)
-{
- visitor->visitEnum(this);
-}
-
-Slice::Enum::Enum(const ContainerPtr& container, const string& name) :
- Constructed(container, name),
- Type(container->unit()),
- Contained(container, name),
- SyntaxTreeBase(container->unit())
+Slice::DataMember::containedType()
{
+ return ContainedTypeDataMember;
}
-// ----------------------------------------------------------------------
-// Enumerator
-// ----------------------------------------------------------------------
-
bool
-Slice::Enumerator::uses(const ConstructedPtr& constructed)
+Slice::DataMember::uses(const ConstructedPtr& constructed)
{
+ ContainedPtr contained = ContainedPtr::dynamicCast(_type);
+ if (contained && contained == constructed)
+ {
+ return true;
+ }
+
return false;
}
-Contained::ContainedType
-Slice::Enumerator::containedType()
+void
+Slice::DataMember::visit(ParserVisitor* visitor)
{
- return ContainedTypeEnumerator;
+ visitor->visitDataMember(this);
}
-Slice::Enumerator::Enumerator(const ContainerPtr& container, const string& name) :
+Slice::DataMember::DataMember(const ContainerPtr& container, const string& name, const TypePtr& type) :
Contained(container, name),
- SyntaxTreeBase(container->unit())
+ SyntaxTreeBase(container->unit()),
+ _type(type)
{
}
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 0754f1cbf2c..cd3045dcee9 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -106,6 +106,16 @@ using namespace Slice;
}
"class" {
+ BoolTokPtr local = new BoolTok;
+ local->v = false;
+ *yylvalp = local;
+ return ICE_CLASS;
+}
+
+"local"[[:space:]]*"class" {
+ BoolTokPtr local = new BoolTok;
+ local->v = true;
+ *yylvalp = local;
return ICE_CLASS;
}
@@ -114,6 +124,16 @@ using namespace Slice;
}
"interface" {
+ BoolTokPtr local = new BoolTok;
+ local->v = false;
+ *yylvalp = local;
+ return ICE_INTERFACE;
+}
+
+"local"[[:space:]]*"interface" {
+ BoolTokPtr local = new BoolTok;
+ local->v = true;
+ *yylvalp = local;
return ICE_INTERFACE;
}
@@ -122,6 +142,16 @@ using namespace Slice;
}
"exception" {
+ BoolTokPtr local = new BoolTok;
+ local->v = false;
+ *yylvalp = local;
+ return ICE_EXCEPTION;
+}
+
+"local"[[:space:]]*"exception" {
+ BoolTokPtr local = new BoolTok;
+ local->v = true;
+ *yylvalp = local;
return ICE_EXCEPTION;
}
@@ -130,6 +160,16 @@ using namespace Slice;
}
"struct" {
+ BoolTokPtr local = new BoolTok;
+ local->v = false;
+ *yylvalp = local;
+ return ICE_STRUCT;
+}
+
+"local"[[:space:]]*"struct" {
+ BoolTokPtr local = new BoolTok;
+ local->v = true;
+ *yylvalp = local;
return ICE_STRUCT;
}
@@ -137,11 +177,57 @@ using namespace Slice;
return ICE_OP_KEYWORD;
}
-"local" {
- return ICE_LOCAL;
+"sequence" {
+ BoolTokPtr local = new BoolTok;
+ local->v = false;
+ *yylvalp = local;
+ return ICE_SEQUENCE;
+}
+
+"local"[[:space:]]*"sequence" {
+ BoolTokPtr local = new BoolTok;
+ local->v = true;
+ *yylvalp = local;
+ return ICE_SEQUENCE;
+}
+
+"sequence"[[:space:]]*"(" {
+ return ICE_OP_KEYWORD;
+}
+
+"local"[[:space:]]*"dictionary" {
+ BoolTokPtr local = new BoolTok;
+ local->v = true;
+ *yylvalp = local;
+ return ICE_DICTIONARY;
+}
+
+"dictionary" {
+ BoolTokPtr local = new BoolTok;
+ local->v = false;
+ *yylvalp = local;
+ return ICE_DICTIONARY;
+}
+
+"dictionary"[[:space:]]*"(" {
+ return ICE_OP_KEYWORD;
+}
+
+"enum" {
+ BoolTokPtr local = new BoolTok;
+ local->v = false;
+ *yylvalp = local;
+ return ICE_ENUM;
+}
+
+"local"[[:space:]]*"enum" {
+ BoolTokPtr local = new BoolTok;
+ local->v = true;
+ *yylvalp = local;
+ return ICE_ENUM;
}
-"local"[[:space:]]*"(" {
+"enum"[[:space:]]*"(" {
return ICE_OP_KEYWORD;
}
@@ -265,30 +351,6 @@ using namespace Slice;
return ICE_OP_KEYWORD;
}
-"sequence" {
- return ICE_SEQUENCE;
-}
-
-"sequence"[[:space:]]*"(" {
- return ICE_OP_KEYWORD;
-}
-
-"dictionary" {
- return ICE_DICTIONARY;
-}
-
-"dictionary"[[:space:]]*"(" {
- return ICE_OP_KEYWORD;
-}
-
-"enum" {
- return ICE_ENUM;
-}
-
-"enum"[[:space:]]*"(" {
- return ICE_OP_KEYWORD;
-}
-
"nonmutating" {
return ICE_NONMUTATING;
}
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 69a7343aaa4..d52ce182ed3 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -138,12 +138,15 @@ Slice::Gen::generate(const UnitPtr& unit)
ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport);
unit->visit(&objectDeclVisitor);
- IceVisitor iceVisitor(H, C, _dllExport);
- unit->visit(&iceVisitor);
+ IceInternalVisitor iceInternalVisitor(H, C, _dllExport);
+ unit->visit(&iceInternalVisitor);
HandleVisitor handleVisitor(H, C, _dllExport);
unit->visit(&handleVisitor);
+ GlobalVisitor globalVisitor(H, C, _dllExport);
+ unit->visit(&globalVisitor);
+
TypesVisitor typesVisitor(H, C, _dllExport);
unit->visit(&typesVisitor);
@@ -380,28 +383,13 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
string name = p->name();
string scoped = p->scoped();
- H << sp << nl << _dllExport << "void __write(::IceInternal::BasicStream*) const;"; // NOT virtual!
- H << nl << _dllExport << "void __read(::IceInternal::BasicStream*);"; // NOT virtual!
+ H << sp;
H << nl << _dllExport << "bool operator==(const " << name << "&) const;";
H << nl << _dllExport << "bool operator!=(const " << name << "&) const;";
H << nl << _dllExport << "bool operator<(const " << name << "&) const;";
- H << eb << ';';
- TypeStringList memberList;
DataMemberList dataMembers = p->dataMembers();
DataMemberList::const_iterator q;
- for (q = dataMembers.begin(); q != dataMembers.end(); ++q)
- {
- memberList.push_back(make_pair((*q)->type(), (*q)->name()));
- }
- C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const";
- C << sb;
- writeMarshalCode(C, memberList, 0);
- C << eb;
- C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
- C << sb;
- writeUnmarshalCode(C, memberList, 0);
- C << eb;
C << sp << nl << "bool" << nl << scoped.substr(2) << "::operator==(const " << name << "& __rhs) const";
C << sb;
C << nl << "return !operator!=(__rhs);";
@@ -440,6 +428,29 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
}
C << nl << "return false;";
C << eb;
+
+ if (!p->isLocal())
+ {
+ H << sp;
+ H << nl << _dllExport << "void __write(::IceInternal::BasicStream*) const;"; // NOT virtual!
+ H << nl << _dllExport << "void __read(::IceInternal::BasicStream*);"; // NOT virtual!
+
+ TypeStringList memberList;
+ for (q = dataMembers.begin(); q != dataMembers.end(); ++q)
+ {
+ memberList.push_back(make_pair((*q)->type(), (*q)->name()));
+ }
+ C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const";
+ C << sb;
+ writeMarshalCode(C, memberList, 0);
+ C << eb;
+ C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
+ C << sb;
+ writeUnmarshalCode(C, memberList, 0);
+ C << eb;
+ }
+
+ H << eb << ';';
}
void
@@ -463,7 +474,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
H << sp << nl << "typedef ::std::vector<" << s << "> " << name << ';';
BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
- if (!builtin)
+ if (!builtin && !p->isLocal())
{
string scoped = p->scoped();
string scope = p->scope();
@@ -522,36 +533,40 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
string vs = typeToString(valueType);
H << sp << nl << "typedef ::std::map<" << ks << ", " << vs << "> " << name << ';';
- string scoped = p->scoped();
- string scope = p->scope();
-
- H << sp << nl << "class __U__" << name << " { };";
- H << nl << _dllExport << "void __write(::IceInternal::BasicStream*, const " << name << "&, __U__" << name << ");";
- H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "&, __U__" << name << ");";
- C << sp << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, const " << scoped
- << "& v, " << scope << "__U__" << name << ")";
- C << sb;
- C << nl << "__os->write(::Ice::Int(v.size()));";
- C << nl << scoped << "::const_iterator p;";
- C << nl << "for (p = v.begin(); p != v.end(); ++p)";
- C << sb;
- writeMarshalUnmarshalCode(C, keyType, "p->first", true);
- writeMarshalUnmarshalCode(C, valueType, "p->second", true);
- C << eb;
- C << eb;
- C << sp << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped
- << "& v, " << scope << "__U__" << name << ')';
- C << sb;
- C << nl << "::Ice::Int sz;";
- C << nl << "__is->read(sz);";
- C << nl << "while (sz--)";
- C << sb;
- C << nl << "::std::pair<" << ks << ", " << vs << "> pair;";
- writeMarshalUnmarshalCode(C, keyType, "pair.first", false);
- writeMarshalUnmarshalCode(C, valueType, "pair.second", false);
- C << nl << "v.insert(v.end(), pair);";
- C << eb;
- C << eb;
+ if (!p->isLocal())
+ {
+ string scoped = p->scoped();
+ string scope = p->scope();
+
+ H << sp << nl << "class __U__" << name << " { };";
+ H << nl << _dllExport << "void __write(::IceInternal::BasicStream*, const " << name << "&, __U__" << name
+ << ");";
+ H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "&, __U__" << name << ");";
+ C << sp << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, const "
+ << scoped << "& v, " << scope << "__U__" << name << ")";
+ C << sb;
+ C << nl << "__os->write(::Ice::Int(v.size()));";
+ C << nl << scoped << "::const_iterator p;";
+ C << nl << "for (p = v.begin(); p != v.end(); ++p)";
+ C << sb;
+ writeMarshalUnmarshalCode(C, keyType, "p->first", true);
+ writeMarshalUnmarshalCode(C, valueType, "p->second", true);
+ C << eb;
+ C << eb;
+ C << sp << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped
+ << "& v, " << scope << "__U__" << name << ')';
+ C << sb;
+ C << nl << "::Ice::Int sz;";
+ C << nl << "__is->read(sz);";
+ C << nl << "while (sz--)";
+ C << sb;
+ C << nl << "::std::pair<" << ks << ", " << vs << "> pair;";
+ writeMarshalUnmarshalCode(C, keyType, "pair.first", false);
+ writeMarshalUnmarshalCode(C, valueType, "pair.second", false);
+ C << nl << "v.insert(v.end(), pair);";
+ C << eb;
+ C << eb;
+ }
}
void
@@ -572,61 +587,64 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
}
H << eb << ';';
- string scoped = p->scoped();
- string scope = p->scope();
-
- int sz = enumerators.size();
-
- H << sp << nl << _dllExport << "void __write(::IceInternal::BasicStream*, " << name << ");";
- H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "&);";
- C << sp << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, " << scoped
- << " v)";
- C << sb;
- if (sz <= 0x7f)
- {
- C << nl << "__os->write(static_cast< ::Ice::Byte>(v));";
- }
- else if (sz <= 0x7fff)
- {
- C << nl << "__os->write(static_cast< ::Ice::Short>(v));";
- }
- else if (sz <= 0x7fffffff)
- {
- C << nl << "__os->write(static_cast< ::Ice::Int>(v));";
- }
- else
- {
- C << nl << "__os->write(static_cast< ::Ice::Long>(v));";
- }
- C << eb;
- C << sp << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped
- << "& v)";
- C << sb;
- if (sz <= 0x7f)
- {
- C << nl << "::Ice::Byte val;";
- C << nl << "__is->read(val);";
- C << nl << "v = static_cast< " << scoped << ">(val);";
- }
- else if (sz <= 0x7fff)
- {
- C << nl << "::Ice::Short val;";
- C << nl << "__is->read(val);";
- C << nl << "v = static_cast< " << scoped << ">(val);";
- }
- else if (sz <= 0x7fffffff)
- {
- C << nl << "::Ice::Int val;";
- C << nl << "__is->read(val);";
- C << nl << "v = static_cast< " << scoped << ">(val);";
- }
- else
+ if (!p->isLocal())
{
- C << nl << "::Ice::Long val;";
- C << nl << "__is->read(val);";
- C << nl << "v = static_cast< " << scoped << ">(val);";
+ string scoped = p->scoped();
+ string scope = p->scope();
+
+ int sz = enumerators.size();
+
+ H << sp << nl << _dllExport << "void __write(::IceInternal::BasicStream*, " << name << ");";
+ H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, " << name << "&);";
+ C << sp << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, " << scoped
+ << " v)";
+ C << sb;
+ if (sz <= 0x7f)
+ {
+ C << nl << "__os->write(static_cast< ::Ice::Byte>(v));";
+ }
+ else if (sz <= 0x7fff)
+ {
+ C << nl << "__os->write(static_cast< ::Ice::Short>(v));";
+ }
+ else if (sz <= 0x7fffffff)
+ {
+ C << nl << "__os->write(static_cast< ::Ice::Int>(v));";
+ }
+ else
+ {
+ C << nl << "__os->write(static_cast< ::Ice::Long>(v));";
+ }
+ C << eb;
+ C << sp << nl << "void" << nl << scope.substr(2) << "__read(::IceInternal::BasicStream* __is, " << scoped
+ << "& v)";
+ C << sb;
+ if (sz <= 0x7f)
+ {
+ C << nl << "::Ice::Byte val;";
+ C << nl << "__is->read(val);";
+ C << nl << "v = static_cast< " << scoped << ">(val);";
+ }
+ else if (sz <= 0x7fff)
+ {
+ C << nl << "::Ice::Short val;";
+ C << nl << "__is->read(val);";
+ C << nl << "v = static_cast< " << scoped << ">(val);";
+ }
+ else if (sz <= 0x7fffffff)
+ {
+ C << nl << "::Ice::Int val;";
+ C << nl << "__is->read(val);";
+ C << nl << "v = static_cast< " << scoped << ">(val);";
+ }
+ else
+ {
+ C << nl << "::Ice::Long val;";
+ C << nl << "__is->read(val);";
+ C << nl << "v = static_cast< " << scoped << ">(val);";
+ }
+ C << eb;
}
- C << eb;
}
Slice::Gen::ProxyDeclVisitor::ProxyDeclVisitor(Output& h, Output& c, const string& dllExport) :
@@ -1630,17 +1648,10 @@ void
Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
{
if (!p->isLocal())
- {
+ {
string name = p->name();
string scoped = p->scoped();
- ClassList bases = p->bases();
- ClassDefPtr base;
- if (!bases.empty() && !bases.front()->isInterface())
- {
- base = bases.front();
- }
-
string exp2;
if (_dllExport.size())
{
@@ -1650,6 +1661,13 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
}
}
+ ClassList bases = p->bases();
+ ClassDefPtr base;
+ if (!bases.empty() && !bases.front()->isInterface())
+ {
+ base = bases.front();
+ }
+
OperationList allOps = p->allOperations();
if (!allOps.empty())
{
@@ -1944,13 +1962,13 @@ Slice::Gen::ObjectVisitor::visitDataMember(const DataMemberPtr& p)
H << nl << s << ' ' << name << ';';
}
-Slice::Gen::IceVisitor::IceVisitor(Output& h, Output& c, const string& dllExport) :
+Slice::Gen::IceInternalVisitor::IceInternalVisitor(Output& h, Output& c, const string& dllExport) :
H(h), C(c), _dllExport(dllExport)
{
}
bool
-Slice::Gen::IceVisitor::visitUnitStart(const UnitPtr& p)
+Slice::Gen::IceInternalVisitor::visitUnitStart(const UnitPtr& p)
{
if (!p->hasClassDecls())
{
@@ -1964,14 +1982,14 @@ Slice::Gen::IceVisitor::visitUnitStart(const UnitPtr& p)
}
void
-Slice::Gen::IceVisitor::visitUnitEnd(const UnitPtr& p)
+Slice::Gen::IceInternalVisitor::visitUnitEnd(const UnitPtr& p)
{
H << sp;
H << nl << '}';
}
void
-Slice::Gen::IceVisitor::visitClassDecl(const ClassDeclPtr& p)
+Slice::Gen::IceInternalVisitor::visitClassDecl(const ClassDeclPtr& p)
{
string scoped = p->scoped();
@@ -1992,7 +2010,7 @@ Slice::Gen::IceVisitor::visitClassDecl(const ClassDeclPtr& p)
}
bool
-Slice::Gen::IceVisitor::visitClassDefStart(const ClassDefPtr& p)
+Slice::Gen::IceInternalVisitor::visitClassDefStart(const ClassDefPtr& p)
{
string scoped = p->scoped();
@@ -2159,3 +2177,100 @@ Slice::Gen::HandleVisitor::visitClassDefStart(const ClassDefPtr& p)
return true;
}
+
+Slice::Gen::GlobalVisitor::GlobalVisitor(Output& h, Output& c, const string& dllExport) :
+ H(h), C(c), _dllExport(dllExport)
+{
+}
+
+void
+Slice::Gen::GlobalVisitor::visitClassDecl(const ClassDeclPtr& p)
+{
+ string scoped = p->scoped();
+
+ H << sp;
+ H << nl << _dllExport << "bool operator==(const " << scoped << "&, const " << scoped << "&);";
+ H << nl << _dllExport << "bool operator!=(const " << scoped << "&, const " << scoped << "&);";
+ H << nl << _dllExport << "bool operator<(const " << scoped << "&, const " << scoped << "&);";
+
+ if (!p->isLocal())
+ {
+ H << sp;
+ H << nl << _dllExport << "bool operator==(const " << scoped << "&, const " << scoped << "&);";
+ H << nl << _dllExport << "bool operator!=(const " << scoped << "&, const " << scoped << "&);";
+ H << nl << _dllExport << "bool operator<(const " << scoped << "&, const " << scoped << "&);";
+ }
+}
+
+bool
+Slice::Gen::GlobalVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+ string scoped = p->scoped();
+
+ if (p->isLocal())
+ {
+ C << sp;
+ C << nl << "bool" << nl << "operator==(const " << scoped << "& l, const " << scoped << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::Ice::LocalObject&>(l) == static_cast< const ::Ice::LocalObject&>(r);";
+ C << eb;
+
+ C << sp;
+ C << nl << "bool" << nl << "operator!=(const " << scoped << "& l, const " << scoped << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::Ice::LocalObject&>(l) != static_cast< const ::Ice::LocalObject&>(r);";
+ C << eb;
+
+ C << sp;
+ C << nl << "bool" << nl << "operator<(const " << scoped << "& l, const " << scoped << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::Ice::LocalObject&>(l) < static_cast< const ::Ice::LocalObject&>(r);";
+ C << eb;
+ }
+ else
+ {
+ C << sp;
+ C << nl << "bool" << nl << "operator==(const " << scoped << "& l, const " << scoped << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::Ice::Object&>(l) == static_cast< const ::Ice::Object&>(r);";
+ C << eb;
+
+ C << sp;
+ C << nl << "bool" << nl << "operator!=(const " << scoped << "& l, const " << scoped << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::Ice::Object&>(l) != static_cast< const ::Ice::Object&>(r);";
+ C << eb;
+
+ C << sp;
+ C << nl << "bool" << nl << "operator<(const " << scoped << "& l, const " << scoped << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::Ice::Object&>(l) < static_cast< const ::Ice::Object&>(r);";
+ C << eb;
+
+ C << sp;
+ C << nl << "bool" << nl << "operator==(const ::IceProxy" << scoped << "& l, const ::IceProxy" << scoped
+ << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::IceProxy::Ice::Object&>(l) == "
+ << "static_cast< const ::IceProxy::Ice::Object&>(r);";
+ C << eb;
+
+ C << sp;
+ C << nl << "bool" << nl << "operator!=(const ::IceProxy" << scoped << "& l, const ::IceProxy" << scoped
+ << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::IceProxy::Ice::Object&>(l) != "
+ << "static_cast< const ::IceProxy::Ice::Object&>(r);";
+ C << eb;
+
+ C << sp;
+ C << nl << "bool" << nl << "operator<(const ::IceProxy" << scoped << "& l, const ::IceProxy" << scoped
+ << "& r)";
+ C << sb;
+ C << nl << "return static_cast< const ::IceProxy::Ice::Object&>(l) < "
+ << "static_cast< const ::IceProxy::Ice::Object&>(r);";
+ C << eb;
+ }
+
+ return true;
+}
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index cbe7618926d..f21aadc01cb 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -218,11 +218,11 @@ private:
std::string _dllExport;
};
- class IceVisitor : public ::IceUtil::noncopyable, public ParserVisitor
+ class IceInternalVisitor : public ::IceUtil::noncopyable, public ParserVisitor
{
public:
- IceVisitor(Output&, Output&, const std::string&);
+ IceInternalVisitor(Output&, Output&, const std::string&);
virtual bool visitUnitStart(const UnitPtr&);
virtual void visitUnitEnd(const UnitPtr&);
@@ -255,6 +255,23 @@ private:
std::string _dllExport;
};
+
+ class GlobalVisitor : public ::IceUtil::noncopyable, public ParserVisitor
+ {
+ public:
+
+ GlobalVisitor(Output&, Output&, const std::string&);
+
+ virtual void visitClassDecl(const ClassDeclPtr&);
+ virtual bool visitClassDefStart(const ClassDefPtr&);
+
+ private:
+
+ Output& H;
+ Output& C;
+
+ std::string _dllExport;
+ };
};
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 11:46:16 +0000