12 files changed, 63 insertions, 1 deletions
diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp
index f3e00cd566b..0a5ada7f8ba 100644
--- a/cpp/src/FreezeScript/Exception.cpp
+++ b/cpp/src/FreezeScript/Exception.cpp
@@ -19,6 +19,10 @@ FreezeScript::FailureException::FailureException(const char* file, int line, con
 {
 }
 
+FreezeScript::FailureException::~FailureException() throw()
+{
+}
+
 const char* FreezeScript::FailureException::_name = "FreezeScript::FailureException";
 
 string
diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h
index 950dd40700c..cf937137c13 100644
--- a/cpp/src/FreezeScript/Exception.h
+++ b/cpp/src/FreezeScript/Exception.h
@@ -20,6 +20,7 @@ class FailureException : public IceUtil::Exception
 public:
     
     FailureException(const char*, int, const std::string&);
+    virtual ~FailureException() throw();
     virtual std::string ice_name() const;
     virtual void ice_print(std::ostream&) const;
     virtual IceUtil::Exception* ice_clone() const;
diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp
index 2b42e63f95b..933c62a0837 100644
--- a/cpp/src/FreezeScript/Parser.cpp
+++ b/cpp/src/FreezeScript/Parser.cpp
@@ -126,6 +126,10 @@ FreezeScript::EvaluateException::EvaluateException(const char* file, int line, c
 {
 }
 
+FreezeScript::EvaluateException::~EvaluateException() throw()
+{
+}
+
 const char* FreezeScript::EvaluateException::_name = "FreezeScript::EvaluateException";
 
 string
diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h
index 33a24a845d6..3563d5a2548 100644
--- a/cpp/src/FreezeScript/Parser.h
+++ b/cpp/src/FreezeScript/Parser.h
@@ -39,6 +39,7 @@ class EvaluateException : public IceUtil::Exception
 public:
     
     EvaluateException(const char*, int, const std::string&);
+    virtual ~EvaluateException() throw();
     virtual std::string ice_name() const;
     virtual void ice_print(std::ostream&) const;
     virtual IceUtil::Exception* ice_clone() const;
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index b090f88b013..74826bc0cea 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -29,6 +29,10 @@ Ice::LocalException::LocalException(const char* file, int line) :
 {
 }
 
+Ice::LocalException::~LocalException() throw()
+{
+}
+
 #if defined(__SUNPRO_CC)
 ostream&
 Ice::operator<<(ostream& out, const Ice::UserException& ex)
diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp
index e63b7ba6be7..394d33115a6 100755
--- a/cpp/src/IceSSL/Certificate.cpp
+++ b/cpp/src/IceSSL/Certificate.cpp
@@ -28,6 +28,10 @@ CertificateReadException::CertificateReadException(const char* file, int line, c
 {
 }
 
+CertificateReadException::~CertificateReadException() throw()
+{
+}
+
 string
 CertificateReadException::ice_name() const
 {
@@ -55,6 +59,10 @@ CertificateEncodingException::CertificateEncodingException(const char* file, int
 {
 }
 
+CertificateEncodingException::~CertificateEncodingException() throw()
+{
+}
+
 string
 CertificateEncodingException::ice_name() const
 {
@@ -227,6 +235,10 @@ ParseException::ParseException(const char* file, int line, const string& r) :
 {
 }
 
+ParseException::~ParseException() throw()
+{
+}
+
 string
 ParseException::ice_name() const
 {
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index a6a9753570d..e7ecdd591a0 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -266,6 +266,10 @@ ConnectionInvalidException::ConnectionInvalidException(const char* file, int lin
 {
 }
 
+ConnectionInvalidException::~ConnectionInvalidException() throw()
+{
+}
+
 string
 ConnectionInvalidException::ice_name() const
 {
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index f61cbfda023..b5bea03a7ee 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -30,7 +30,7 @@ IceUtil::Exception::Exception(const char* file, int line) :
 {
 }
     
-IceUtil::Exception::~Exception()
+IceUtil::Exception::~Exception() throw()
 {
 }
 
@@ -92,6 +92,10 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
     }
 }
 
+IceUtil::NullHandleException::~NullHandleException() throw()
+{
+}
+
 const char* IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
 
 string
@@ -123,6 +127,10 @@ IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, in
 {
 }
 
+IceUtil::IllegalArgumentException::~IllegalArgumentException() throw()
+{
+}
+
 const char* IceUtil::IllegalArgumentException::_name = "IceUtil::IllegalArgumentException";
 
 string
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index 2a93e0e5eb8..0e9fef64713 100755
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -18,6 +18,10 @@ IceUtil::APIException::APIException(const char* file, int line, const string& r)
 {
 }
 
+IceUtil::APIException::~APIException() throw()
+{
+}
+
 const char* IceUtil::APIException::_name = "IceUtil::APIException";
 
 string
@@ -51,6 +55,10 @@ IceUtil::BadOptException::BadOptException(const char* file, int line, const stri
 {
 }
 
+IceUtil::BadOptException::~BadOptException() throw()
+{
+}
+
 const char* IceUtil::BadOptException::_name = "IceUtil::BadOptException";
 
 string
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 828e668f199..c79bf1de3de 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -28,6 +28,10 @@ IceXML::ParserException::ParserException(const char* file, int line, const strin
 {
 }
 
+IceXML::ParserException::~ParserException() throw()
+{
+}
+
 const char* IceXML::ParserException::_name = "IceXML::ParserException";
 
 string
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index f4dc26876f4..cd652e3591d 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -571,6 +571,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 	}
 	H << allTypes << epar << ';';
     }
+    H << nl << "virtual ~" << name << "() throw();";
     H << sp;
 
     if(p->isLocal())
@@ -637,6 +638,11 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 	C << eb;
     }
 
+    C << sp << nl;
+    C << scoped.substr(2) << "::~" << name << "() throw()";
+    C << sb;
+    C << eb;
+
     H << nl << "virtual ::std::string ice_name() const;";
 
     string flatName = p->flattenedScope() + p->name() + "_name";
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 703965d4f70..32757b02a76 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -503,6 +503,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 	}
 	H << allTypes << epar << ';';
     }
+    H << nl << "virtual ~" << name << "() throw();";
     H << sp;
 
     if(p->isLocal())
@@ -569,6 +570,11 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 	C << eb;
     }
 
+    C << sp << nl;
+    C << scoped.substr(2) << "::~" << name << "() throw()";
+    C << sb;
+    C << eb;
+
     H << nl << "virtual ::std::string ice_name() const;";
 
     string flatName = p->flattenedScope() + p->name() + "_name";