summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/.depend12
-rw-r--r--cpp/src/Ice/Incoming.cpp2
-rw-r--r--cpp/src/Ice/Outgoing.cpp2
-rw-r--r--cpp/src/Ice/Proxy.cpp13
-rw-r--r--cpp/src/Ice/Stream.cpp14
-rw-r--r--cpp/src/Ice/ice.dsp4
-rw-r--r--cpp/src/IcePack/.depend1
-rw-r--r--cpp/src/IcePack/Makefile58
-rw-r--r--cpp/src/Makefile4
-rw-r--r--cpp/src/Slice/Makefile4
-rw-r--r--cpp/src/slice2cpp/.depend2
-rw-r--r--cpp/src/slice2cpp/Gen.cpp23
-rw-r--r--cpp/src/slice2docbook/.depend3
-rw-r--r--cpp/src/slice2docbook/Gen.cpp137
-rw-r--r--cpp/src/slice2docbook/Gen.h8
-rw-r--r--cpp/src/slice2docbook/GenUtil.cpp159
-rw-r--r--cpp/src/slice2docbook/GenUtil.h27
-rw-r--r--cpp/src/slice2docbook/Makefile1
-rw-r--r--cpp/src/slice2docbook/docbook.dsp8
19 files changed, 251 insertions, 231 deletions
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index 33f4c0e01e8..ec3d4ea94f0 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -1,5 +1,5 @@
Shared.o: Shared.cpp ../../include/Ice/Shared.h ../../include/Ice/Config.h
-Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../../include/Ice/ValueFactory.h ../Ice/ValueFactoryManager.h ../../include/Ice/ValueFactoryF.h ../../include/Ice/LocalException.h
+Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.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/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../../include/Ice/ValueFactory.h ../Ice/ValueFactoryManager.h ../../include/Ice/ValueFactoryF.h ../../include/Ice/LocalException.h
LocalException.o: LocalException.cpp ../../include/Ice/LocalException.h ../../include/Ice/Config.h ../Ice/Network.h
Pickler.o: Pickler.cpp ../../include/Ice/Pickler.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
PicklerI.o: PicklerI.cpp ../Ice/PicklerI.h ../../include/Ice/Pickler.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
@@ -18,18 +18,18 @@ ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h .
ValueFactory.o: ValueFactory.cpp ../../include/Ice/ValueFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
ValueFactoryManager.o: ValueFactoryManager.cpp ../Ice/ValueFactoryManager.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ValueFactoryF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/ValueFactory.h
Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Shared.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/Native.h ../../include/Ice/LocalObject.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/UdpTransceiver.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
-Reference.o: Reference.cpp ../Ice/Reference.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Shared.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
+Reference.o: Reference.cpp ../Ice/Reference.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Shared.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
LocalObject.o: LocalObject.cpp ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Shared.h
Object.o: Object.cpp ../../include/Ice/Object.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/InstanceF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h
ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Shared.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Proxy.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h
-Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../../include/Ice/ObjectF.h ../Ice/ObjectAdapterFactory.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Outgoing.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
-Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Shared.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../../include/Ice/LocalException.h
+Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../../include/Ice/Object.h ../../include/Ice/ObjectF.h ../Ice/ObjectAdapterFactory.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Outgoing.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
+Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Shared.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../../include/Ice/LocalException.h
Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h
Emitter.o: Emitter.cpp ../Ice/Emitter.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.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/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ThreadPool.h ../Ice/Endpoint.h ../Ice/AcceptorF.h ../../include/Ice/Outgoing.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
Collector.o: Collector.cpp ../Ice/Collector.h ../../include/Ice/CollectorF.h ../../include/Ice/Handle.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/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Stream.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/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../../include/Ice/ObjectAdapter.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../../include/Ice/Incoming.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
Network.o: Network.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/Ice/LocalException.h
-ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../../include/Ice/Shared.h ../Ice/EventHandler.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h
-EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h
+ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../../include/Ice/Shared.h ../Ice/EventHandler.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h
+EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h
Connector.o: Connector.cpp ../Ice/Connector.h ../Ice/ConnectorF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/TransceiverF.h ../../include/Ice/Shared.h
Acceptor.o: Acceptor.cpp ../Ice/Acceptor.h ../Ice/AcceptorF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/TransceiverF.h ../../include/Ice/Shared.h
Transceiver.o: Transceiver.cpp ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/Shared.h
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 292c7b45bfd..3e0d5d3761e 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -72,7 +72,7 @@ IceInternal::Incoming::invoke(Stream& is)
catch(const LocationForward& p)
{
*(_os.b.begin() + statusPos) = static_cast<Byte>(DispatchLocationForward);
- write(&_os, p._prx);
+ _os.write(p._prx);
}
if (locator)
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 9181fbb60b9..50c02c12ca5 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -138,7 +138,7 @@ IceInternal::Outgoing::invoke()
if (_state == StateLocationForward)
{
ObjectPrx p;
- read(&_is, p);
+ _is.read(p);
throw LocationForward(p);
}
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index af0789dfd3b..9f368327613 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -9,7 +9,6 @@
// **********************************************************************
#include <Ice/Proxy.h>
-#include <Ice/ProxyFactory.h>
#include <Ice/Object.h>
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/Outgoing.h>
@@ -49,18 +48,6 @@ IceInternal::uncheckedCast(::IceProxy::Ice::Object* b, ::IceProxy::Ice::Object*&
d = b;
}
-void
-IceInternal::write(Stream* s, const ObjectPrx& v)
-{
- s->instance()->proxyFactory()->proxyToStream(v, s);
-}
-
-void
-IceInternal::read(Stream* s, ObjectPrx& v)
-{
- v = s->instance()->proxyFactory()->streamToProxy(s);
-}
-
Ice::ObjectPrxE::ObjectPrxE(const ObjectPrxE& p) :
_prx(p._prx)
{
diff --git a/cpp/src/Ice/Stream.cpp b/cpp/src/Ice/Stream.cpp
index adc744616fa..a6b327a849b 100644
--- a/cpp/src/Ice/Stream.cpp
+++ b/cpp/src/Ice/Stream.cpp
@@ -11,6 +11,8 @@
#include <Ice/Stream.h>
#include <Ice/Instance.h>
#include <Ice/Object.h>
+#include <Ice/Proxy.h>
+#include <Ice/ProxyFactory.h>
#include <Ice/ValueFactory.h>
#include <Ice/ValueFactoryManager.h>
#include <Ice/LocalException.h>
@@ -774,6 +776,18 @@ IceInternal::Stream::read(vector<wstring>& v)
}
void
+IceInternal::Stream::write(const ::Ice::ObjectPrx& v)
+{
+ _instance->proxyFactory()->proxyToStream(v, this);
+}
+
+void
+IceInternal::Stream::read(::Ice::ObjectPrx& v)
+{
+ v = _instance->proxyFactory()->streamToProxy(this);
+}
+
+void
IceInternal::Stream::write(const ObjectPtr& v)
{
const string* classIds = v->_classIds();
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 33c813733e8..a8401ebbdce 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -74,7 +74,7 @@ PostBuild_Cmds=copy Release\ice001.* ..\..\lib
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/cpp/src/IcePack/.depend b/cpp/src/IcePack/.depend
new file mode 100644
index 00000000000..6fe0e0596bc
--- /dev/null
+++ b/cpp/src/IcePack/.depend
@@ -0,0 +1 @@
+Admin.o: Admin.cpp ../../include/IcePack/Admin.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalException.h
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
new file mode 100644
index 00000000000..109c105dc99
--- /dev/null
+++ b/cpp/src/IcePack/Makefile
@@ -0,0 +1,58 @@
+# **********************************************************************
+#
+# Copyright (c) 2001
+# MutableRealms, Inc.
+# Huntsville, AL, USA
+#
+# All Rights Reserved
+#
+# **********************************************************************
+
+top_srcdir = ../..
+
+BASE = libIcePack.so
+VERSIONED_BASE = $(BASE).$(VERSION)
+
+NAME = $(top_srcdir)/lib/$(BASE)
+VERSIONED_NAME = $(top_srcdir)/lib/$(VERSIONED_BASE)
+
+TARGETS = $(NAME) $(VERSIONED_NAME)
+
+OBJS = Admin.o
+
+SRCS = $(OBJS:.o=.cpp)
+
+HDIR = $(includedir)/IcePack
+IDIR = $(slicedir)/IcePack
+SLICECMD = $(SLICE) --include-dir IcePack --dll-export ICE_PACK_API -I$(slicedir)
+
+include $(top_srcdir)/config/Make.rules
+
+CPPFLAGS := -I.. $(CPPFLAGS)
+
+$(VERSIONED_NAME): $(OBJS)
+ rm -f $@
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+$(NAME): $(VERSIONED_NAME)
+ rm -f $@
+ ln -s $(VERSIONED_BASE) $@
+
+$(HDIR)/Admin.h Admin.cpp: $(IDIR)/Admin.ice $(SLICE)
+ rm -f $(HDIR)/Admin.h Admin.cpp
+ $(SLICECMD) $(IDIR)/Admin.ice
+ mv Admin.h $(HDIR)
+
+clean::
+ rm -f $(HDIR)/Admin.h Admin.cpp
+
+$(HDIR)/AdminF.h: $(IDIR)/AdminF.ice $(SLICE)
+ rm -f $(HDIR)/AdminF.h AdminF.cpp
+ $(SLICECMD) $(IDIR)/AdminF.ice
+ mv AdminF.h $(HDIR)
+ rm -f AdminF.cpp
+
+clean::
+ rm -f $(HDIR)/AdminF.h
+
+include .depend
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 6af7be3cf62..59a45a9d339 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -12,7 +12,9 @@ top_srcdir = ..
include $(top_srcdir)/config/Make.rules
-SUBDIRS = slice Ice
+SUBDIRS = slice \
+ Ice \
+ IcePack
$(EVERYTHING)::
@for subdir in $(SUBDIRS); \
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index efdb97c94aa..41a1a5c8601 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -52,9 +52,9 @@ clean::
-rm -f Grammer.cpp Grammer.h Grammer.output
-rm -f Scanner.cpp lex.yy.c
-Shared.cpp: ../../library/Shared.cpp
+Shared.cpp: ../../Ice/Shared.cpp
rm -f $@
- ln -s ../../library/Shared.cpp $@
+ ln -s ../../Ice/Shared.cpp $@
clean::
-rm -f Shared.cpp
diff --git a/cpp/src/slice2cpp/.depend b/cpp/src/slice2cpp/.depend
index de3053fcdab..41caad21c33 100644
--- a/cpp/src/slice2cpp/.depend
+++ b/cpp/src/slice2cpp/.depend
@@ -1,3 +1,3 @@
-Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h GenUtil.h
+Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h
GenUtil.o: GenUtil.cpp GenUtil.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
Main.o: Main.cpp Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 57206998170..c261ac5ee5f 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -10,7 +10,6 @@
#include <Ice/Functional.h>
#include <Gen.h>
-#include <GenUtil.h>
#include <limits>
//
@@ -158,6 +157,22 @@ Slice::Gen::generate(const UnitPtr& unit)
C << "\n#endif";
C.restoreIndent();
+ if (_dllExport.length())
+ {
+ H << sp;
+ H.zeroIndent();
+ H << "\n#ifdef WIN32";
+ H << "\n# ifdef" << _dllExport << "_EXPORTS";
+ H << "\n# define" << _dllExport << " __declspec(dllexport)";
+ H << "\n# else";
+ H << "\n# define" << _dllExport << " __declspec(dllimport)";
+ H << "\n# endif";
+ H << "\n#else";
+ H << "\n# define" << _dllExport << " /**/";
+ H << "\n#endif";
+ H.restoreIndent();
+ }
+
ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
unit->visit(&proxyDeclVisitor);
@@ -1849,15 +1864,13 @@ Slice::Gen::HandleVisitor::visitClassDefStart(const ClassDefPtr& p)
C << sp;
C << nl << "void" << nl << scope << "::__write(::IceInternal::Stream* __os, const " << scoped << "Prx& v)";
C << sb;
- // TODO: Should be ::Ice::__write
- C << nl << "::IceInternal::write(__os, ::Ice::ObjectPrx(v));";
+ C << nl << "__os->write(::Ice::ObjectPrx(v));";
C << eb;
C << sp;
C << nl << "void" << nl << scope << "::__read(::IceInternal::Stream* __is, " << scoped << "Prx& v)";
C << sb;
C << nl << "::Ice::ObjectPrx proxy;";
- // TODO: Should be ::Ice::__read
- C << nl << "::IceInternal::read(__is, proxy);";
+ C << nl << "__is->read(proxy);";
C << nl << "if (!proxy)";
C << sb;
C << nl << "v = 0;";
diff --git a/cpp/src/slice2docbook/.depend b/cpp/src/slice2docbook/.depend
index de3053fcdab..90c5be97e71 100644
--- a/cpp/src/slice2docbook/.depend
+++ b/cpp/src/slice2docbook/.depend
@@ -1,3 +1,2 @@
-Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h GenUtil.h
-GenUtil.o: GenUtil.cpp GenUtil.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
+Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h
Main.o: Main.cpp Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index b7bfed1296f..f0dbc86d38c 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -10,7 +10,6 @@
#include <Ice/Functional.h>
#include <Gen.h>
-#include <GenUtil.h>
using namespace std;
using namespace Slice;
@@ -18,7 +17,8 @@ using namespace Slice;
Slice::Gen::Gen(const string& name, const string& file, bool standAlone, bool noGlobals) :
_standAlone(standAlone),
_noGlobals(noGlobals),
- _chapter("section") // Could also be "chapter"
+ _chapter("section"), // Could also be "chapter"
+ _nextId(0)
{
O.open(file.c_str());
if (!O)
@@ -26,6 +26,13 @@ Slice::Gen::Gen(const string& name, const string& file, bool standAlone, bool no
cerr << name << ": can't open `" << file << "' for writing: " << strerror(errno) << endl;
return;
}
+
+ _idPrefix = file;
+ string::size_type pos = _idPrefix.find_last_of("/\\");
+ if(pos != string::npos)
+ {
+ _idPrefix.erase(0, pos + 1);
+ }
}
Slice::Gen::~Gen()
@@ -734,3 +741,129 @@ Slice::Gen::end()
O.dec();
O << nl << "</" << element << '>';
}
+
+string
+Slice::Gen::scopedToId(const string& scoped)
+{
+ string s;
+ if (scoped[0] == ':')
+ {
+ s = scoped.substr(2);
+ }
+ else
+ {
+ s = scoped;
+ }
+
+ int id = _idMap[s];
+ if (id == 0)
+ {
+ id = ++_nextId;
+ _idMap[s] = id;
+ }
+
+ ostringstream result;
+ result << '"' << _idPrefix << '.' << id << '"';
+ return result.str();
+}
+
+string
+Slice::Gen::getScopedMinimized(const ContainedPtr& contained, const ContainerPtr& container)
+{
+ string s = contained->scoped();
+ ContainerPtr p = container;
+ ContainedPtr q;
+
+ while((q = ContainedPtr::dynamicCast(p)))
+ {
+ string s2 = q->scoped();
+ s2 += "::";
+
+ if (s.find(s2) == 0)
+ {
+ return s.substr(s2.size());
+ }
+
+ p = q->container();
+ }
+
+ return s;
+}
+
+string
+Slice::Gen::toString(const SyntaxTreeBasePtr& p, const ContainerPtr& container)
+{
+ static const char* builtinTable[] =
+ {
+ "byte",
+ "bool",
+ "short",
+ "int",
+ "long",
+ "float",
+ "double",
+ "string",
+ "wstring",
+ "Object",
+ "Object*",
+ "LocalObject"
+ };
+
+ BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
+ if (builtin)
+ {
+ return "<type>" + string(builtinTable[builtin->kind()]) + "</type>";
+ }
+
+ string tag;
+ string linkend;
+ string s;
+
+ ProxyPtr proxy = ProxyPtr::dynamicCast(p);
+ if (proxy)
+ {
+ tag = "classname";
+ linkend = scopedToId(proxy->_class()->scoped());
+ s = getScopedMinimized(proxy->_class(), container);
+ s += "*";
+ }
+
+ ClassDeclPtr cl = ClassDeclPtr::dynamicCast(p);
+ if (cl)
+ {
+ tag = "classname";
+ linkend = scopedToId(cl->scoped());
+ s = getScopedMinimized(cl, container);
+ }
+
+ if (s.empty())
+ {
+ ContainedPtr contained = ContainedPtr::dynamicCast(p);
+ assert(contained);
+ tag = "type";
+ linkend = scopedToId(contained->scoped());
+ s = getScopedMinimized(contained, container);
+ }
+
+ return "<link linkend=" + linkend + "><" + tag + ">" + s + "</" + tag + "></link>";
+}
+
+string
+Slice::Gen::toString(const string& str, const ContainerPtr& container)
+{
+ string s = str;
+
+ TypeList types = container->lookupType(s, false);
+ if (!types.empty())
+ {
+ return toString(types.front(), container);
+ }
+
+ ContainedList contList = container->lookupContained(s, false);
+ if (!contList.empty())
+ {
+ return toString(contList.front(), container);
+ }
+
+ return s;
+}
diff --git a/cpp/src/slice2docbook/Gen.h b/cpp/src/slice2docbook/Gen.h
index 61e8522bc09..60b89ac6a90 100644
--- a/cpp/src/slice2docbook/Gen.h
+++ b/cpp/src/slice2docbook/Gen.h
@@ -45,12 +45,20 @@ private:
void start(const std::string&, const std::string&);
void end();
+ std::string scopedToId(const std::string&);
+ std::string getScopedMinimized(const ContainedPtr&, const ContainerPtr&);
+ std::string toString(const SyntaxTreeBasePtr&, const ContainerPtr&);
+ std::string toString(const std::string&, const ContainerPtr&);
+
Output O;
bool _standAlone;
bool _noGlobals;
std::string _chapter;
std::stack<std::string> _elementStack;
+ std::string _idPrefix;
+ std::map<std::string, int> _idMap;
+ int _nextId;
};
}
diff --git a/cpp/src/slice2docbook/GenUtil.cpp b/cpp/src/slice2docbook/GenUtil.cpp
deleted file mode 100644
index 470eaa3ba9c..00000000000
--- a/cpp/src/slice2docbook/GenUtil.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#include <GenUtil.h>
-#include <sstream>
-
-using namespace std;
-using namespace Slice;
-
-string
-Slice::getScopedMinimized(const ContainedPtr& contained, const ContainerPtr& container)
-{
- string s = contained->scoped();
- ContainerPtr p = container;
- ContainedPtr q;
-
- while((q = ContainedPtr::dynamicCast(p)))
- {
- string s2 = q->scoped();
- s2 += "::";
-
- if (s.find(s2) == 0)
- {
- return s.substr(s2.size());
- }
-
- p = q->container();
- }
-
- return s;
-}
-
-string
-Slice::toString(const SyntaxTreeBasePtr& p, const ContainerPtr& container)
-{
- static const char* builtinTable[] =
- {
- "byte",
- "bool",
- "short",
- "int",
- "long",
- "float",
- "double",
- "string",
- "wstring",
- "Object",
- "Object*",
- "LocalObject"
- };
-
- BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
- if (builtin)
- {
- return "<type>" + string(builtinTable[builtin->kind()]) + "</type>";
- }
-
- string tag;
- string linkend;
- string s;
-
- ProxyPtr proxy = ProxyPtr::dynamicCast(p);
- if (proxy)
- {
- tag = "classname";
- linkend = scopedToId(proxy->_class()->scoped());
- s = getScopedMinimized(proxy->_class(), container);
- s += "*";
- }
-
- ClassDeclPtr cl = ClassDeclPtr::dynamicCast(p);
- if (cl)
- {
- tag = "classname";
- linkend = scopedToId(cl->scoped());
- s = getScopedMinimized(cl, container);
- }
-
- if (s.empty())
- {
- ContainedPtr contained = ContainedPtr::dynamicCast(p);
- assert(contained);
- tag = "type";
- linkend = scopedToId(contained->scoped());
- s = getScopedMinimized(contained, container);
- }
-
- return "<link linkend=" + linkend + "><" + tag + ">" + s + "</" + tag + "></link>";
-}
-
-string
-Slice::toString(const string& str, const ContainerPtr& container)
-{
- string s = str;
-
- TypeList types = container->lookupType(s, false);
- if (!types.empty())
- {
- return toString(types.front(), container);
- }
-
- ContainedList contList = container->lookupContained(s, false);
- if (!contList.empty())
- {
- return toString(contList.front(), container);
- }
-
- return s;
-}
-
-struct ToFile
-{
- char operator()(char c)
- {
- if (c == ':')
- {
- return '_';
- }
- else
- {
- return c;
- }
- }
-};
-
-string
-Slice::scopedToId(const string& scoped)
-{
- static map<string, int> idMap;
- static int _nextId = 0;
-
- string s;
- if (scoped[0] == ':')
- {
- s = scoped.substr(2);
- }
- else
- {
- s = scoped;
- }
-
- int id = idMap[s];
- if (id == 0)
- {
- id = ++_nextId;
- idMap[s] = id;
- }
-
- ostringstream result;
- result << "\"slice2docbook." << id << '"';
- return result.str();
-}
diff --git a/cpp/src/slice2docbook/GenUtil.h b/cpp/src/slice2docbook/GenUtil.h
deleted file mode 100644
index b353f4d0e1e..00000000000
--- a/cpp/src/slice2docbook/GenUtil.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#ifndef GEN_UTIL_H
-#define GEN_UTIL_H
-
-#include <Parser.h>
-#include <OutputUtil.h>
-
-namespace Slice
-{
-
-std::string getScopedMinimized(const ContainedPtr&, const ContainerPtr&);
-std::string toString(const SyntaxTreeBasePtr&, const ContainerPtr&);
-std::string toString(const std::string&, const ContainerPtr&);
-std::string scopedToId(const std::string&);
-
-}
-
-#endif
diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile
index e52cf8d0289..4b3d02d1303 100644
--- a/cpp/src/slice2docbook/Makefile
+++ b/cpp/src/slice2docbook/Makefile
@@ -15,7 +15,6 @@ NAME = $(top_srcdir)/bin/slice2docbook
TARGETS = $(NAME)
OBJS = Gen.o \
- GenUtil.o \
Main.o
SRCS = $(OBJS:.o=.cpp)
diff --git a/cpp/src/slice2docbook/docbook.dsp b/cpp/src/slice2docbook/docbook.dsp
index 96f2d02d71a..5dd23646936 100644
--- a/cpp/src/slice2docbook/docbook.dsp
+++ b/cpp/src/slice2docbook/docbook.dsp
@@ -91,10 +91,6 @@ SOURCE=.\Gen.cpp
# End Source File
# Begin Source File
-SOURCE=.\GenUtil.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Main.cpp
# End Source File
# End Group
@@ -105,10 +101,6 @@ SOURCE=.\Main.cpp
SOURCE=.\Gen.h
# End Source File
-# Begin Source File
-
-SOURCE=.\GenUtil.h
-# End Source File
# End Group
# Begin Group "Resource Files"
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 21:17:25 +0000