Derive from std::exception

3 files changed, 210 insertions, 2 deletions

diff --git a/cppe/src/IceE/ExceptionBase.cpp b/cppe/src/IceE/ExceptionBase.cpp
index 327098fb317..394f9183720 100755
--- a/cppe/src/IceE/ExceptionBase.cpp
+++ b/cppe/src/IceE/ExceptionBase.cpp
@@ -31,7 +31,7 @@ IceUtil::Exception::Exception(const char* file, int line) :
 {
 }
     
-IceUtil::Exception::~Exception()
+IceUtil::Exception::~Exception() throw()
 {
 }
 
@@ -95,6 +95,10 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
     }
 }
 
+IceUtil::NullHandleException::~NullHandleException() throw()
+{
+}
+
 const char* IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
 
 string
@@ -126,6 +130,10 @@ IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, in
 {
 }
 
+IceUtil::IllegalArgumentException::~IllegalArgumentException() throw()
+{
+}
+
 const char* IceUtil::IllegalArgumentException::_name = "IceUtil::IllegalArgumentException";
 
 string
diff --git a/cppe/src/IceE/LocalException.cpp b/cppe/src/IceE/LocalException.cpp
index f8c208cc15a..d004d537ac1 100755
--- a/cppe/src/IceE/LocalException.cpp
+++ b/cppe/src/IceE/LocalException.cpp
@@ -21,6 +21,10 @@ Ice::LocalException::LocalException(const char* file, int line) :
 {
 }
 
+Ice::LocalException::~LocalException() throw()
+{
+}
+
 Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* __file, int __line) :
 #if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
     LocalException(__file, __line)
@@ -41,6 +45,10 @@ Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* __file,
 {
 }
 
+Ice::AlreadyRegisteredException::~AlreadyRegisteredException() throw()
+{
+}
+
 static const char* __Ice__AlreadyRegisteredException_name = "Ice::AlreadyRegisteredException";
 
 ::std::string
@@ -81,6 +89,10 @@ Ice::NotRegisteredException::NotRegisteredException(const char* __file, int __li
 {
 }
 
+Ice::NotRegisteredException::~NotRegisteredException() throw()
+{
+}
+
 static const char* __Ice__NotRegisteredException_name = "Ice::NotRegisteredException";
 
 ::std::string
@@ -120,6 +132,10 @@ Ice::TwowayOnlyException::TwowayOnlyException(const char* __file, int __line, co
 {
 }
 
+Ice::TwowayOnlyException::~TwowayOnlyException() throw()
+{
+}
+
 static const char* __Ice__TwowayOnlyException_name = "Ice::TwowayOnlyException";
 
 ::std::string
@@ -149,6 +165,10 @@ Ice::CloneNotImplementedException::CloneNotImplementedException(const char* __fi
 {
 }
 
+Ice::CloneNotImplementedException::~CloneNotImplementedException() throw()
+{
+}
+
 static const char* __Ice__CloneNotImplementedException_name = "Ice::CloneNotImplementedException";
 
 ::std::string
@@ -188,6 +208,10 @@ Ice::UnknownException::UnknownException(const char* __file, int __line, const ::
 {
 }
 
+Ice::UnknownException::~UnknownException() throw()
+{
+}
+
 static const char* __Ice__UnknownException_name = "Ice::UnknownException";
 
 ::std::string
@@ -226,6 +250,10 @@ Ice::UnknownLocalException::UnknownLocalException(const char* __file, int __line
 {
 }
 
+Ice::UnknownLocalException::~UnknownLocalException() throw()
+{
+}
+
 static const char* __Ice__UnknownLocalException_name = "Ice::UnknownLocalException";
 
 ::std::string
@@ -264,6 +292,10 @@ Ice::UnknownUserException::UnknownUserException(const char* __file, int __line,
 {
 }
 
+Ice::UnknownUserException::~UnknownUserException() throw()
+{
+}
+
 static const char* __Ice__UnknownUserException_name = "Ice::UnknownUserException";
 
 ::std::string
@@ -293,6 +325,10 @@ Ice::VersionMismatchException::VersionMismatchException(const char* __file, int
 {
 }
 
+Ice::VersionMismatchException::~VersionMismatchException() throw()
+{
+}
+
 static const char* __Ice__VersionMismatchException_name = "Ice::VersionMismatchException";
 
 ::std::string
@@ -322,6 +358,10 @@ Ice::CommunicatorDestroyedException::CommunicatorDestroyedException(const char*
 {
 }
 
+Ice::CommunicatorDestroyedException::~CommunicatorDestroyedException() throw()
+{
+}
+
 static const char* __Ice__CommunicatorDestroyedException_name = "Ice::CommunicatorDestroyedException";
 
 ::std::string
@@ -363,6 +403,10 @@ Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const
 {
 }
 
+Ice::ObjectAdapterDeactivatedException::~ObjectAdapterDeactivatedException() throw()
+{
+}
+
 static const char* __Ice__ObjectAdapterDeactivatedException_name = "Ice::ObjectAdapterDeactivatedException";
 
 ::std::string
@@ -411,6 +455,10 @@ Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* __
 {
 }
 
+Ice::ObjectAdapterIdInUseException::~ObjectAdapterIdInUseException() throw()
+{
+}
+
 static const char* __Ice__ObjectAdapterIdInUseException_name = "Ice::ObjectAdapterIdInUseException";
 
 ::std::string
@@ -466,6 +514,10 @@ Ice::NoEndpointException::NoEndpointException(const char* __file, int __line, co
 {
 }
 
+Ice::NoEndpointException::~NoEndpointException() throw()
+{
+}
+
 static const char* __Ice__NoEndpointException_name = "Ice::NoEndpointException";
 
 ::std::string
@@ -505,6 +557,10 @@ Ice::EndpointParseException::EndpointParseException(const char* __file, int __li
 {
 }
 
+Ice::EndpointParseException::~EndpointParseException() throw()
+{
+}
+
 static const char* __Ice__EndpointParseException_name = "Ice::EndpointParseException";
 
 ::std::string
@@ -544,6 +600,10 @@ Ice::IdentityParseException::IdentityParseException(const char* __file, int __li
 {
 }
 
+Ice::IdentityParseException::~IdentityParseException() throw()
+{
+}
+
 static const char* __Ice__IdentityParseException_name = "Ice::IdentityParseException";
 
 ::std::string
@@ -583,6 +643,10 @@ Ice::ProxyParseException::ProxyParseException(const char* __file, int __line, co
 {
 }
 
+Ice::ProxyParseException::~ProxyParseException() throw()
+{
+}
+
 static const char* __Ice__ProxyParseException_name = "Ice::ProxyParseException";
 
 ::std::string
@@ -622,6 +686,10 @@ Ice::IllegalIdentityException::IllegalIdentityException(const char* __file, int
 {
 }
 
+Ice::IllegalIdentityException::~IllegalIdentityException() throw()
+{
+}
+
 static const char* __Ice__IllegalIdentityException_name = "Ice::IllegalIdentityException";
 
 ::std::string
@@ -663,6 +731,10 @@ Ice::RequestFailedException::RequestFailedException(const char* __file, int __li
 {
 }
 
+Ice::RequestFailedException::~RequestFailedException() throw()
+{
+}
+
 static const char* __Ice__RequestFailedException_name = "Ice::RequestFailedException";
 
 ::std::string
@@ -701,6 +773,10 @@ Ice::ObjectNotExistException::ObjectNotExistException(const char* __file, int __
 {
 }
 
+Ice::ObjectNotExistException::~ObjectNotExistException() throw()
+{
+}
+
 static const char* __Ice__ObjectNotExistException_name = "Ice::ObjectNotExistException";
 
 ::std::string
@@ -739,6 +815,10 @@ Ice::FacetNotExistException::FacetNotExistException(const char* __file, int __li
 {
 }
 
+Ice::FacetNotExistException::~FacetNotExistException() throw()
+{
+}
+
 static const char* __Ice__FacetNotExistException_name = "Ice::FacetNotExistException";
 
 ::std::string
@@ -777,6 +857,10 @@ Ice::OperationNotExistException::OperationNotExistException(const char* __file,
 {
 }
 
+Ice::OperationNotExistException::~OperationNotExistException() throw()
+{
+}
+
 static const char* __Ice__OperationNotExistException_name = "Ice::OperationNotExistException";
 
 ::std::string
@@ -816,6 +900,10 @@ Ice::SyscallException::SyscallException(const char* __file, int __line, ::Ice::I
 {
 }
 
+Ice::SyscallException::~SyscallException() throw()
+{
+}
+
 static const char* __Ice__SyscallException_name = "Ice::SyscallException";
 
 ::std::string
@@ -854,6 +942,10 @@ Ice::SocketException::SocketException(const char* __file, int __line, ::Ice::Int
 {
 }
 
+Ice::SocketException::~SocketException() throw()
+{
+}
+
 static const char* __Ice__SocketException_name = "Ice::SocketException";
 
 ::std::string
@@ -893,6 +985,10 @@ Ice::FileException::FileException(const char* __file, int __line, ::Ice::Int __e
 {
 }
 
+Ice::FileException::~FileException() throw()
+{
+}
+
 static const char* __Ice__FileException_name = "Ice::FileException";
 
 ::std::string
@@ -931,6 +1027,10 @@ Ice::ConnectFailedException::ConnectFailedException(const char* __file, int __li
 {
 }
 
+Ice::ConnectFailedException::~ConnectFailedException() throw()
+{
+}
+
 static const char* __Ice__ConnectFailedException_name = "Ice::ConnectFailedException";
 
 ::std::string
@@ -969,6 +1069,10 @@ Ice::ConnectionRefusedException::ConnectionRefusedException(const char* __file,
 {
 }
 
+Ice::ConnectionRefusedException::~ConnectionRefusedException() throw()
+{
+}
+
 static const char* __Ice__ConnectionRefusedException_name = "Ice::ConnectionRefusedException";
 
 ::std::string
@@ -1007,6 +1111,10 @@ Ice::ConnectionLostException::ConnectionLostException(const char* __file, int __
 {
 }
 
+Ice::ConnectionLostException::~ConnectionLostException() throw()
+{
+}
+
 static const char* __Ice__ConnectionLostException_name = "Ice::ConnectionLostException";
 
 ::std::string
@@ -1047,6 +1155,10 @@ Ice::DNSException::DNSException(const char* __file, int __line, ::Ice::Int __err
 {
 }
 
+Ice::DNSException::~DNSException() throw()
+{
+}
+
 static const char* __Ice__DNSException_name = "Ice::DNSException";
 
 ::std::string
@@ -1076,6 +1188,10 @@ Ice::TimeoutException::TimeoutException(const char* __file, int __line) :
 {
 }
 
+Ice::TimeoutException::~TimeoutException() throw()
+{
+}
+
 static const char* __Ice__TimeoutException_name = "Ice::TimeoutException";
 
 ::std::string
@@ -1105,6 +1221,10 @@ Ice::ConnectTimeoutException::ConnectTimeoutException(const char* __file, int __
 {
 }
 
+Ice::ConnectTimeoutException::~ConnectTimeoutException() throw()
+{
+}
+
 static const char* __Ice__ConnectTimeoutException_name = "Ice::ConnectTimeoutException";
 
 ::std::string
@@ -1134,6 +1254,10 @@ Ice::CloseTimeoutException::CloseTimeoutException(const char* __file, int __line
 {
 }
 
+Ice::CloseTimeoutException::~CloseTimeoutException() throw()
+{
+}
+
 static const char* __Ice__CloseTimeoutException_name = "Ice::CloseTimeoutException";
 
 ::std::string
@@ -1163,6 +1287,10 @@ Ice::ProtocolException::ProtocolException(const char* __file, int __line) :
 {
 }
 
+Ice::ProtocolException::~ProtocolException() throw()
+{
+}
+
 static const char* __Ice__ProtocolException_name = "Ice::ProtocolException";
 
 ::std::string
@@ -1202,6 +1330,10 @@ Ice::BadMagicException::BadMagicException(const char* __file, int __line, const
 {
 }
 
+Ice::BadMagicException::~BadMagicException() throw()
+{
+}
+
 static const char* __Ice__BadMagicException_name = "Ice::BadMagicException";
 
 ::std::string
@@ -1244,6 +1376,10 @@ Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* __fi
 {
 }
 
+Ice::UnsupportedProtocolException::~UnsupportedProtocolException() throw()
+{
+}
+
 static const char* __Ice__UnsupportedProtocolException_name = "Ice::UnsupportedProtocolException";
 
 ::std::string
@@ -1286,6 +1422,10 @@ Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* __fi
 {
 }
 
+Ice::UnsupportedEncodingException::~UnsupportedEncodingException() throw()
+{
+}
+
 static const char* __Ice__UnsupportedEncodingException_name = "Ice::UnsupportedEncodingException";
 
 ::std::string
@@ -1315,6 +1455,10 @@ Ice::UnknownMessageException::UnknownMessageException(const char* __file, int __
 {
 }
 
+Ice::UnknownMessageException::~UnknownMessageException() throw()
+{
+}
+
 static const char* __Ice__UnknownMessageException_name = "Ice::UnknownMessageException";
 
 ::std::string
@@ -1344,6 +1488,10 @@ Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char
 {
 }
 
+Ice::ConnectionNotValidatedException::~ConnectionNotValidatedException() throw()
+{
+}
+
 static const char* __Ice__ConnectionNotValidatedException_name = "Ice::ConnectionNotValidatedException";
 
 ::std::string
@@ -1373,6 +1521,10 @@ Ice::UnknownRequestIdException::UnknownRequestIdException(const char* __file, in
 {
 }
 
+Ice::UnknownRequestIdException::~UnknownRequestIdException() throw()
+{
+}
+
 static const char* __Ice__UnknownRequestIdException_name = "Ice::UnknownRequestIdException";
 
 ::std::string
@@ -1402,6 +1554,10 @@ Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* __file
 {
 }
 
+Ice::UnknownReplyStatusException::~UnknownReplyStatusException() throw()
+{
+}
+
 static const char* __Ice__UnknownReplyStatusException_name = "Ice::UnknownReplyStatusException";
 
 ::std::string
@@ -1431,6 +1587,10 @@ Ice::CloseConnectionException::CloseConnectionException(const char* __file, int
 {
 }
 
+Ice::CloseConnectionException::~CloseConnectionException() throw()
+{
+}
+
 static const char* __Ice__CloseConnectionException_name = "Ice::CloseConnectionException";
 
 ::std::string
@@ -1460,6 +1620,10 @@ Ice::ForcedCloseConnectionException::ForcedCloseConnectionException(const char*
 {
 }
 
+Ice::ForcedCloseConnectionException::~ForcedCloseConnectionException() throw()
+{
+}
+
 static const char* __Ice__ForcedCloseConnectionException_name = "Ice::ForcedCloseConnectionException";
 
 ::std::string
@@ -1489,6 +1653,10 @@ Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* __file
 {
 }
 
+Ice::IllegalMessageSizeException::~IllegalMessageSizeException() throw()
+{
+}
+
 static const char* __Ice__IllegalMessageSizeException_name = "Ice::IllegalMessageSizeException";
 
 ::std::string
@@ -1518,6 +1686,10 @@ Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* __fi
 {
 }
 
+Ice::FeatureNotSupportedException::~FeatureNotSupportedException() throw()
+{
+}
+
 static const char* __Ice__FeatureNotSupportedException_name = "Ice::FeatureNotSupportedException";
 
 ::std::string
@@ -1557,6 +1729,10 @@ Ice::MarshalException::MarshalException(const char* __file, int __line, const ::
 {
 }
 
+Ice::MarshalException::~MarshalException() throw()
+{
+}
+
 static const char* __Ice__MarshalException_name = "Ice::MarshalException";
 
 ::std::string
@@ -1595,6 +1771,10 @@ Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* __file, int __
 {
 }
 
+Ice::ProxyUnmarshalException::~ProxyUnmarshalException() throw()
+{
+}
+
 static const char* __Ice__ProxyUnmarshalException_name = "Ice::ProxyUnmarshalException";
 
 ::std::string
@@ -1633,6 +1813,10 @@ Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* __
 {
 }
 
+Ice::UnmarshalOutOfBoundsException::~UnmarshalOutOfBoundsException() throw()
+{
+}
+
 static const char* __Ice__UnmarshalOutOfBoundsException_name = "Ice::UnmarshalOutOfBoundsException";
 
 ::std::string
@@ -1671,6 +1855,10 @@ Ice::MemoryLimitException::MemoryLimitException(const char* __file, int __line,
 {
 }
 
+Ice::MemoryLimitException::~MemoryLimitException() throw()
+{
+}
+
 static const char* __Ice__MemoryLimitException_name = "Ice::MemoryLimitException";
 
 ::std::string
@@ -1710,6 +1898,10 @@ Ice::StringConversionException::StringConversionException(const char* __file, in
 {
 }
 
+Ice::StringConversionException::~StringConversionException() throw()
+{
+}
+
 static const char* __Ice__StringConversionException_name = "Ice::StringConversionException";
 
 ::std::string
@@ -1748,6 +1940,10 @@ Ice::EncapsulationException::EncapsulationException(const char* __file, int __li
 {
 }
 
+Ice::EncapsulationException::~EncapsulationException() throw()
+{
+}
+
 static const char* __Ice__EncapsulationException_name = "Ice::EncapsulationException";
 
 ::std::string
@@ -1786,6 +1982,10 @@ Ice::NegativeSizeException::NegativeSizeException(const char* __file, int __line
 {
 }
 
+Ice::NegativeSizeException::~NegativeSizeException() throw()
+{
+}
+
 static const char* __Ice__NegativeSizeException_name = "Ice::NegativeSizeException";
 
 ::std::string
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 2608eda96c8..575ab651137 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -692,7 +692,7 @@ IceProxy::Ice::Object::ice_getConnection()
 }
 
 ConnectionPtr
-IceProxy::Ice::Object::ice_getCachedConnection()
+IceProxy::Ice::Object::ice_getCachedConnection() const
 {
     ::IceUtil::Mutex::Lock sync(*this);
     return _connection;