Back out previous change

2 files changed, 1 insertions, 209 deletions

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