summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/BasicStream.cpp8
-rw-r--r--cpp/src/Ice/Exception.cpp299
-rw-r--r--cpp/src/Ice/Proxy.cpp8
-rw-r--r--cpp/src/IceUtil/.depend1
-rw-r--r--cpp/src/IceUtil/Exception.cpp105
-rw-r--r--cpp/src/IceUtil/Makefile35
-rw-r--r--cpp/src/IceUtil/iceutil.dsp1282
-rw-r--r--cpp/src/Makefile3
-rw-r--r--cpp/src/slice2cpp/Gen.cpp12
9 files changed, 1591 insertions, 162 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index e874ab1c618..4a020b5ff8a 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -620,8 +620,8 @@ IceInternal::BasicStream::write(const string& v)
int pos = b.size();
resize(pos + len);
copy(v.begin(), v.end(), b.begin() + pos);
-// Int sz = _encapsStack.back().stringsWritten.size();
-// _encapsStack.back().stringsWritten[v] = -(sz + 1);
+ Int sz = _encapsStack.back().stringsWritten.size();
+ _encapsStack.back().stringsWritten[v] = -(sz + 1);
}
}
}
@@ -649,8 +649,6 @@ IceInternal::BasicStream::read(string& v)
Int len;
read(len);
- assert(len >= 0);
-
if (len < 0)
{
if (static_cast<vector<string>::size_type>(-(len + 1)) >= _encapsStack.back().stringsRead.size())
@@ -675,7 +673,7 @@ IceInternal::BasicStream::read(string& v)
}
v.resize(len);
copy(begin, i, v.begin());
-// _encapsStack.back().stringsRead.push_back(v);
+ _encapsStack.back().stringsRead.push_back(v);
}
}
}
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 3becb0f7419..9669096755b 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -20,262 +20,269 @@ Ice::LocalException::LocalException(const char* file, int line) :
{
}
-ostream&
-IceUtil::printException(ostream& out, const UnknownLocalException& ex)
+void
+Ice::UnknownLocalException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nunknown local exception";
+ IceUtil::Exception::_print(out);
+ out << ":\nunknown local exception";
}
-ostream&
-IceUtil::printException(ostream& out, const UnknownUserException& ex)
+void
+Ice::UnknownUserException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nunknown user exception";
+ IceUtil::Exception::_print(out);
+ out << ":\nunknown user exception";
}
-ostream&
-IceUtil::printException(ostream& out, const UnknownException& ex)
+void
+Ice::UnknownException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nunknown C++ exception";
+ IceUtil::Exception::_print(out);
+ out << ":\nunknown C++ exception";
}
-ostream&
-IceUtil::printException(ostream& out, const VersionMismatchException& ex)
+void
+Ice::VersionMismatchException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nIce library version mismatch";
+ IceUtil::Exception::_print(out);
+ out << ":\nIce library version mismatch";
}
-ostream&
-IceUtil::printException(ostream& out, const CommunicatorDestroyedException& ex)
+void
+Ice::CommunicatorDestroyedException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\ncommunicator object destroyed";
+ IceUtil::Exception::_print(out);
+ out << ":\ncommunicator object destroyed";
}
-ostream&
-IceUtil::printException(ostream& out, const ObjectAdapterDeactivatedException& ex)
+void
+Ice::ObjectAdapterDeactivatedException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nobject adapter deactivated";
+ IceUtil::Exception::_print(out);
+ out << ":\nobject adapter deactivated";
}
-ostream&
-IceUtil::printException(ostream& out, const NoEndpointException& ex)
+void
+Ice::NoEndpointException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nno suitable endpoint available";
+ IceUtil::Exception::_print(out);
+ out << ":\nno suitable endpoint available";
}
-ostream&
-IceUtil::printException(ostream& out, const EndpointParseException& ex)
+void
+Ice::EndpointParseException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nerror while parsing endpoint";
+ IceUtil::Exception::_print(out);
+ out << ":\nerror while parsing endpoint";
}
-ostream&
-IceUtil::printException(ostream& out, const ReferenceParseException& ex)
+void
+Ice::ReferenceParseException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nerror while parsing reference";
+ IceUtil::Exception::_print(out);
+ out << ":\nerror while parsing reference";
}
-ostream&
-IceUtil::printException(ostream& out, const ReferenceIdentityException& ex)
+void
+Ice::ReferenceIdentityException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nreference identity mismatch in location forward";
+ IceUtil::Exception::_print(out);
+ out << ":\nreference identity mismatch in location forward";
}
-ostream&
-IceUtil::printException(ostream& out, const ObjectNotExistException& ex)
+void
+Ice::ObjectNotExistException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nobject does not exist";
+ IceUtil::Exception::_print(out);
+ out << ":\nobject does not exist";
}
-ostream&
-IceUtil::printException(ostream& out, const OperationNotExistException& ex)
+void
+Ice::FacetNotExistException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\noperation does not exist";
+ IceUtil::Exception::_print(out);
+ out << ":\nfacet does not exist";
}
-ostream&
-IceUtil::printException(ostream& out, const SystemException& ex)
+void
+Ice::OperationNotExistException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nsystem exception: " << errorToString(ex.error);
+ IceUtil::Exception::_print(out);
+ out << ":\noperation does not exist";
}
-ostream&
-IceUtil::printException(ostream& out, const SocketException& ex)
+void
+Ice::SystemException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nsystem exception: " << errorToString(ex.error);
+ IceUtil::Exception::_print(out);
+ out << ":\nsystem exception: " << errorToString(error);
}
-ostream&
-IceUtil::printException(ostream& out, const ConnectFailedException& ex)
+void
+Ice::SocketException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nconnect failed: " << errorToString(ex.error);
+ IceUtil::Exception::_print(out);
+ out << ":\nsocket exception: " << errorToString(error);
}
-ostream&
-IceUtil::printException(ostream& out, const ConnectionLostException& ex)
+void
+Ice::ConnectFailedException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
+ IceUtil::Exception::_print(out);
+ out << ":\nconnect failed: " << errorToString(error);
+}
+
+void
+Ice::ConnectionLostException::_print(ostream& out) const
+{
+ IceUtil::Exception::_print(out);
out << ":\nconnection lost: ";
- if (ex.error == 0)
+ if (error == 0)
{
- return out << "recv() returned zero";
+ out << "recv() returned zero";
}
else
{
- return out << errorToString(ex.error);
+ out << errorToString(error);
}
}
-ostream&
-IceUtil::printException(ostream& out, const DNSException& ex)
+void
+Ice::DNSException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nDNS error: " + errorToStringDNS(ex.error);
+ IceUtil::Exception::_print(out);
+ out << ":\nDNS error: " << errorToStringDNS(error);
}
-ostream&
-IceUtil::printException(ostream& out, const TimeoutException& ex)
+void
+Ice::TimeoutException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\ntimeout while sending or receiving data";
+ IceUtil::Exception::_print(out);
+ out << ":\ntimeout while sending or receiving data";
}
-ostream&
-IceUtil::printException(ostream& out, const ConnectTimeoutException& ex)
+void
+Ice::ConnectTimeoutException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\ntimeout while establishing a connection";
+ IceUtil::Exception::_print(out);
+ out << ":\ntimeout while establishing a connection";
}
-ostream&
-IceUtil::printException(ostream& out, const ProtocolException& ex)
+void
+Ice::ProtocolException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nunknown protocol exception";
+ IceUtil::Exception::_print(out);
+ out << ":\nunknown protocol exception";
}
-ostream&
-IceUtil::printException(ostream& out, const UnmarshalOutOfBoundsException& ex)
+void
+Ice::UnmarshalOutOfBoundsException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: out of bounds during unmarshaling";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: out of bounds during unmarshaling";
}
-ostream&
-IceUtil::printException(ostream& out, const NoServantFactoryException& ex)
+void
+Ice::NoServantFactoryException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: no servant factory found for servant with operations";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: no servant factory found for servant with operations";
}
-ostream&
-IceUtil::printException(ostream& out, const ServantUnmarshalException& ex)
+void
+Ice::ServantUnmarshalException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: servant type unknown or doesn't match signature";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: servant type unknown or doesn't match signature";
}
-ostream&
-IceUtil::printException(ostream& out, const UserExceptionUnmarshalException& ex)
+void
+Ice::UserExceptionUnmarshalException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: exception type unknown or doesn't match signature";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: exception type unknown or doesn't match signature";
}
-ostream&
-IceUtil::printException(ostream& out, const ProxyUnmarshalException& ex)
+void
+Ice::ProxyUnmarshalException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: inconsistent proxy data during unmarshaling";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: inconsistent proxy data during unmarshaling";
}
-ostream&
-IceUtil::printException(ostream& out, const StringEncodingException& ex)
+void
+Ice::StringEncodingException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: string encoding error";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: string encoding error";
}
-ostream&
-IceUtil::printException(ostream& out, const MemoryLimitException& ex)
+void
+Ice::MemoryLimitException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: memory limit exceeded";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: memory limit exceeded";
}
-ostream&
-IceUtil::printException(ostream& out, const EncapsulationException& ex)
+void
+Ice::EncapsulationException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: illegal encapsulation";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: illegal encapsulation";
}
-ostream&
-IceUtil::printException(ostream& out, const UnsupportedProtocolException& ex)
+void
+Ice::UnsupportedProtocolException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: unsupported protocol version";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: unsupported protocol version";
}
-ostream&
-IceUtil::printException(ostream& out, const UnsupportedEncodingException& ex)
+void
+Ice::UnsupportedEncodingException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: unsupported encoding version";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: unsupported encoding version";
}
-ostream&
-IceUtil::printException(ostream& out, const InvalidMessageException& ex)
+void
+Ice::InvalidMessageException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: invalid message type";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: invalid message type";
}
-ostream&
-IceUtil::printException(ostream& out, const UnknownMessageException& ex)
+void
+Ice::UnknownMessageException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: unknown message type";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: unknown message type";
}
-ostream&
-IceUtil::printException(ostream& out, const UnknownRequestIdException& ex)
+void
+Ice::UnknownRequestIdException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: unknown request id";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: unknown request id";
}
-ostream&
-IceUtil::printException(ostream& out, const UnknownReplyStatusException& ex)
+void
+Ice::UnknownReplyStatusException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: unknown reply status";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: unknown reply status";
}
-ostream&
-IceUtil::printException(ostream& out, const CloseConnectionException& ex)
+void
+Ice::CloseConnectionException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: connection closed by server";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: connection closed by server";
}
-ostream&
-IceUtil::printException(ostream& out, const AbortBatchRequestException& ex)
+void
+Ice::AbortBatchRequestException::_print(ostream& out) const
{
- IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
- return out << ":\nprotocol error: batch request was aborted";
+ IceUtil::Exception::_print(out);
+ out << ":\nprotocol error: batch request was aborted";
}
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 9957c3b4353..a4353eca0a7 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -164,7 +164,7 @@ IceProxy::Ice::Object::_getIdentity() const
return _reference->identity;
}
-::Ice::ObjectPrx
+ObjectPrx
IceProxy::Ice::Object::_newIdentity(const std::string& newIdentity) const
{
if (newIdentity == _reference->identity)
@@ -185,7 +185,7 @@ IceProxy::Ice::Object::_getFacet() const
return _reference->facet;
}
-::Ice::ObjectPrx
+ObjectPrx
IceProxy::Ice::Object::_newFacet(const std::string& newFacet) const
{
if (newFacet == _reference->facet)
@@ -319,13 +319,13 @@ IceProxy::Ice::Object::__reference() const
}
void
-IceProxy::Ice::Object::__copyFrom(const ::IceProxy::Ice::Object* from)
+IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from)
{
setup(from->__reference());
}
void
-IceProxy::Ice::Object::__copyFromWithFacet(const ::IceProxy::Ice::Object* from, const string& facet)
+IceProxy::Ice::Object::__copyFromWithFacet(const ObjectPrx& from, const string& facet)
{
setup(from->__reference()->changeFacet(facet));
}
diff --git a/cpp/src/IceUtil/.depend b/cpp/src/IceUtil/.depend
new file mode 100644
index 00000000000..73056a9c02a
--- /dev/null
+++ b/cpp/src/IceUtil/.depend
@@ -0,0 +1 @@
+Exception.o: Exception.cpp ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
new file mode 100644
index 00000000000..ccc6abbd48c
--- /dev/null
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -0,0 +1,105 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <IceUtil/Exception.h>
+
+using namespace std;
+
+IceUtil::Exception::Exception() :
+ _theFile(0),
+ _theLine(0)
+{
+}
+
+IceUtil::Exception::Exception(const char* file, int line) :
+ _theFile(file),
+ _theLine(line)
+{
+}
+
+IceUtil::Exception::~Exception()
+{
+}
+
+string
+IceUtil::Exception::_name() const
+{
+ return "IceUtil::Exception";
+}
+
+void
+IceUtil::Exception::_print(ostream& out) const
+{
+ if (_file() && _line() > 0)
+ {
+ out << _file() << ':' << _line() << ": ";
+ }
+ out << _name();
+}
+
+IceUtil::Exception*
+IceUtil::Exception::_clone() const
+{
+ return new Exception(*this);
+}
+
+void
+IceUtil::Exception::_throw() const
+{
+ throw *this;
+}
+
+const char*
+IceUtil::Exception::_file() const
+{
+ return _theFile;
+}
+
+int
+IceUtil::Exception::_line() const
+{
+ return _theLine;
+}
+
+ostream&
+IceUtil::operator<<(ostream& out, const IceUtil::Exception& ex)
+{
+ ex._print(out);
+ return out;
+}
+
+IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
+ Exception(file, line)
+{
+}
+
+string
+IceUtil::NullHandleException::_name() const
+{
+ return "IceUtil::NullHandleException";
+}
+
+string
+IceUtil::NullHandleException::_description() const
+{
+ return "operation call on null handle";
+}
+
+IceUtil::Exception*
+IceUtil::NullHandleException::_clone() const
+{
+ return new NullHandleException(*this);
+}
+
+void
+IceUtil::NullHandleException::_throw() const
+{
+ throw *this;
+}
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile
new file mode 100644
index 00000000000..e5ab812a5c9
--- /dev/null
+++ b/cpp/src/IceUtil/Makefile
@@ -0,0 +1,35 @@
+# **********************************************************************
+#
+# Copyright (c) 2001
+# MutableRealms, Inc.
+# Huntsville, AL, USA
+#
+# All Rights Reserved
+#
+# **********************************************************************
+
+top_srcdir = ../..
+
+BASE = libIceUtil.so
+VERSIONED_BASE = $(BASE).$(VERSION)
+
+NAME = $(top_srcdir)/lib/$(BASE)
+VERSIONED_NAME = $(top_srcdir)/lib/$(VERSIONED_BASE)
+
+TARGETS = $(NAME) $(VERSIONED_NAME)
+
+OBJS = Exception.o
+
+SRCS = $(OBJS:.o=.cpp)
+
+include $(top_srcdir)/config/Make.rules
+
+$(VERSIONED_NAME): $(OBJS)
+ rm -f $@
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+$(NAME): $(VERSIONED_NAME)
+ rm -f $@
+ ln -s $(VERSIONED_BASE) $@
+
+include .depend
diff --git a/cpp/src/IceUtil/iceutil.dsp b/cpp/src/IceUtil/iceutil.dsp
new file mode 100644
index 00000000000..70b5ed6ba8e
--- /dev/null
+++ b/cpp/src/IceUtil/iceutil.dsp
@@ -0,0 +1,1282 @@
+# Microsoft Developer Studio Project File - Name="IceUtil" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=IceUtil - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "IceUtil.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "IceUtil.mak" CFG="IceUtil - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "IceUtil - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "IceUtil - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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 /WX /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 ws2_32.lib jtc.lib /nologo /dll /machine:I386 /out:"Release/ice001.dll"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy Release\ice001.* ..\..\lib
+# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# 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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /GZ /c
+# SUBTRACT CPP /WX /Fr
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ws2_32.lib jtcd.lib /nologo /dll /debug /machine:I386 /out:"Debug/ice001d.dll" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy Debug\ice001d.* ..\..\lib
+# End Special Build Tool
+
+!ENDIF
+
+# Begin Target
+
+# Name "IceUtil - Win32 Release"
+# Name "IceUtil - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Acceptor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Application.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BasicStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Communicator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CommunicatorI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Connector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Direct.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Emitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Endpoint.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\EventHandler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Incoming.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Instance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\LocalException.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\LocalObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Logger.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\LoggerI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Network.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ObjectAdapter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ObjectAdapterFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ObjectAdapterI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Outgoing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Properties.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PropertiesI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Proxy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ProxyFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Reference.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ServantFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ServantFactoryManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ServantLocator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SslAcceptor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SslConnector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SslTransceiver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Stream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\StreamI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TcpAcceptor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TcpConnector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TcpTransceiver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ThreadPool.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TraceLevels.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TraceUtil.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Transceiver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\UdpTransceiver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\UserExceptionFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\UserExceptionFactoryManager.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\IceUtil\Acceptor.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\AcceptorF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Application.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\BasicStream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Buffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Collector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\CollectorF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Communicator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\CommunicatorF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\CommunicatorI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Connector.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ConnectorF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Direct.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Emitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\EmitterF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Endpoint.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\EndpointF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\EventHandler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\EventHandlerF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Exception.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Functional.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Handle.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\IceUtil.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Incoming.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Initialize.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Instance.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\InstanceF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\LocalException.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\LocalObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\LocalObjectF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Logger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\LoggerF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\LoggerI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Native.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Network.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ObjectAdapter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ObjectAdapterF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ObjectAdapterFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ObjectAdapterFactoryF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ObjectAdapterI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ObjectF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Outgoing.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Properties.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\PropertiesF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\PropertiesI.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Protocol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Proxy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ProxyF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ProxyFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ProxyFactoryF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ProxyHandle.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Reference.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ReferenceF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ServantFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ServantFactoryF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ServantFactoryManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ServantFactoryManagerF.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ServantLocator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\ServantLocatorF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\SslAcceptor.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\SslConnector.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\SslTransceiver.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\Stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\StreamF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\StreamI.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\TcpAcceptor.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\TcpConnector.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\TcpTransceiver.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ThreadPool.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\ThreadPoolF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\TraceLevels.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\TraceLevelsF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\TraceUtil.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\Transceiver.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\TransceiverF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\UdpTransceiver.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\UserExceptionFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceUtil\UserExceptionFactoryF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\UserExceptionFactoryManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IceUtil\UserExceptionFactoryManagerF.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\Communicator.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Communicator.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Communicator.ice \
+ move Communicator.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Communicator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Communicator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Communicator.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Communicator.ice \
+ move Communicator.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Communicator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Communicator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\CommunicatorF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\CommunicatorF.ice
+
+"..\..\include\IceUtil\CommunicatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/CommunicatorF.ice
+ move CommunicatorF.h ..\..\include\IceUtil
+ del CommunicatorF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\CommunicatorF.ice
+
+"..\..\include\IceUtil\CommunicatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/CommunicatorF.ice
+ move CommunicatorF.h ..\..\include\IceUtil
+ del CommunicatorF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\LocalException.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\LocalException.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/LocalException.ice \
+ move LocalException.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\LocalException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"LocalException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\LocalException.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/LocalException.ice \
+ move LocalException.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\LocalException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"LocalException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\Logger.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Logger.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Logger.ice \
+ move Logger.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Logger.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Logger.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Logger.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Logger.ice \
+ move Logger.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Logger.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Logger.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\LoggerF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\LoggerF.ice
+
+"..\..\include\IceUtil\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/LoggerF.ice
+ move LoggerF.h ..\..\include\IceUtil
+ del LoggerF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\LoggerF.ice
+
+"..\..\include\IceUtil\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/LoggerF.ice
+ move LoggerF.h ..\..\include\IceUtil
+ del LoggerF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\ObjectAdapter.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ObjectAdapter.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ObjectAdapter.ice \
+ move ObjectAdapter.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\ObjectAdapter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"ObjectAdapter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ObjectAdapter.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ObjectAdapter.ice \
+ move ObjectAdapter.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\ObjectAdapter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"ObjectAdapter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\ObjectAdapterF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ObjectAdapterF.ice
+
+"..\..\include\IceUtil\ObjectAdapterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ObjectAdapterF.ice
+ move ObjectAdapterF.h ..\..\include\IceUtil
+ del ObjectAdapterF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ObjectAdapterF.ice
+
+"..\..\include\IceUtil\ObjectAdapterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ObjectAdapterF.ice
+ move ObjectAdapterF.h ..\..\include\IceUtil
+ del ObjectAdapterF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\Properties.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Properties.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Properties.ice \
+ move Properties.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Properties.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Properties.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Properties.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Properties.ice \
+ move Properties.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Properties.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Properties.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\PropertiesF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\PropertiesF.ice
+
+"..\..\include\IceUtil\PropertiesF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/PropertiesF.ice
+ move PropertiesF.h ..\..\include\IceUtil
+ del PropertiesF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\PropertiesF.ice
+
+"..\..\include\IceUtil\PropertiesF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/PropertiesF.ice
+ move PropertiesF.h ..\..\include\IceUtil
+ del PropertiesF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\ServantFactory.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantFactory.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantFactory.ice \
+ move ServantFactory.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\ServantFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"ServantFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantFactory.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantFactory.ice \
+ move ServantFactory.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\ServantFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"ServantFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\ServantFactoryF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantFactoryF.ice
+
+"..\..\include\IceUtil\ServantFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantFactoryF.ice
+ move ServantFactoryF.h ..\..\include\IceUtil
+ del ServantFactoryF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantFactoryF.ice
+
+"..\..\include\IceUtil\ServantFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantFactoryF.ice
+ move ServantFactoryF.h ..\..\include\IceUtil
+ del ServantFactoryF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\ServantLocator.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantLocator.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantLocator.ice \
+ move ServantLocator.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\ServantLocator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"ServantLocator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantLocator.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantLocator.ice \
+ move ServantLocator.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\ServantLocator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"ServantLocator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\ServantLocatorF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantLocatorF.ice
+
+"..\..\include\IceUtil\ServantLocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantLocatorF.ice
+ move ServantLocatorF.h ..\..\include\IceUtil
+ del ServantLocatorF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\ServantLocatorF.ice
+
+"..\..\include\IceUtil\ServantLocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/ServantLocatorF.ice
+ move ServantLocatorF.h ..\..\include\IceUtil
+ del ServantLocatorF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\Stream.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Stream.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Stream.ice \
+ move Stream.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\Stream.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/Stream.ice \
+ move Stream.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\StreamF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\StreamF.ice
+
+"..\..\include\IceUtil\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/StreamF.ice
+ move StreamF.h ..\..\include\IceUtil
+ del StreamF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\StreamF.ice
+
+"..\..\include\IceUtil\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/StreamF.ice
+ move StreamF.h ..\..\include\IceUtil
+ del StreamF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\UserExceptionFactory.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\UserExceptionFactory.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/UserExceptionFactory.ice \
+ move UserExceptionFactory.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\UserExceptionFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"UserExceptionFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\UserExceptionFactory.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/UserExceptionFactory.ice \
+ move UserExceptionFactory.h ..\..\include\IceUtil \
+
+
+"..\..\include\IceUtil\UserExceptionFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"UserExceptionFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceUtil\UserExceptionFactoryF.ice
+
+!IF "$(CFG)" == "IceUtil - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\UserExceptionFactoryF.ice
+
+"..\..\include\IceUtil\UserExceptionFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/UserExceptionFactoryF.ice
+ move UserExceptionFactoryF.h ..\..\include\IceUtil
+ del UserExceptionFactoryF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceUtil\UserExceptionFactoryF.ice
+
+"..\..\include\IceUtil\UserExceptionFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IceUtil -I../../slice ../../slice/IceUtil/UserExceptionFactoryF.ice
+ move UserExceptionFactoryF.h ..\..\include\IceUtil
+ del UserExceptionFactoryF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index a37cdc7612c..0023f2f4feb 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -12,7 +12,8 @@ top_srcdir = ..
include $(top_srcdir)/config/Make.rules
-SUBDIRS = Slice \
+SUBDIRS = IceUtil \
+ Slice \
slice2cpp \
slice2freeze \
slice2docbook \
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 1ad8d17faea..e52791c97e2 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -224,6 +224,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
H << nl << "public: ";
H.inc();
+ H << sp;
if (p->isLocal())
{
H << nl << _dllExport << name << "(const char*, int);";
@@ -248,11 +249,10 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
C << nl << "return \"" << scoped.substr(2) << "\";";
C << eb;
- H << nl << _dllExport << "virtual ::std::ostream& _print(::std::ostream&) const;";
- C << sp << nl << "::std::ostream&" << nl << scoped.substr(2) << "::_print(::std::ostream& out) const";
- C << sb;
- C << nl << "return IceUtil::printException(out, *this);";
- C << eb;
+ if (p->isLocal())
+ {
+ H << nl << _dllExport << "virtual void _print(::std::ostream&) const;";
+ }
H << nl << _dllExport << "virtual ::Ice::Exception* _clone() const;";
C << sp << nl << "::Ice::Exception*" << nl << scoped.substr(2) << "::_clone() const";
@@ -2087,7 +2087,7 @@ Slice::Gen::HandleVisitor::visitClassDefStart(const ClassDefPtr& p)
C << nl << "else";
C << sb;
C << nl << "v = new ::IceProxy" << scoped << ';';
- C << nl << "v->__copyFrom(proxy.get());";
+ C << nl << "v->__copyFrom(proxy);";
C << eb;
C << eb;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 11:57:51 +0000