1 files changed, 4 insertions, 22 deletions
diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp
index 7fb39540760..1d1a545e7a4 100755
--- a/cpp/src/IceSSL/Certificate.cpp
+++ b/cpp/src/IceSSL/Certificate.cpp
@@ -597,7 +597,7 @@ certificateAltNames(Windows::Security::Cryptography::Certificates::SubjectAltern
 #endif
 
 CertificateReadException::CertificateReadException(const char* file, int line, const string& r) :
-    Exception(file, line),
+    ExceptionHelper<CertificateReadException>(file, line),
     reason(r)
 {
 }
@@ -622,15 +622,9 @@ CertificateReadException::ice_clone() const
 }
 #endif
 
-void
-CertificateReadException::ice_throw() const
-{
-    throw *this;
-}
-
 #ifdef ICE_USE_SECURE_TRANSPORT
 CertificateEncodingException::CertificateEncodingException(const char* file, int line, CFErrorRef err) :
-    Exception(file, line)
+    ExceptionHelper<CertificateEncodingException>(file, line)
 {
     assert(err);
     reason = "certificate error:\n" + errorToString(err);
@@ -639,7 +633,7 @@ CertificateEncodingException::CertificateEncodingException(const char* file, int
 #endif
 
 CertificateEncodingException::CertificateEncodingException(const char* file, int line, const string& r) :
-    Exception(file, line),
+    ExceptionHelper<CertificateEncodingException>(file, line),
     reason(r)
 {
 }
@@ -664,12 +658,6 @@ CertificateEncodingException::ice_clone() const
 }
 #endif
 
-void
-CertificateEncodingException::ice_throw() const
-{
-    throw *this;
-}
-
 #ifdef ICE_USE_OPENSSL
 
 namespace
@@ -843,7 +831,7 @@ convertGeneralNames(GENERAL_NAMES* gens)
 #endif
 
 ParseException::ParseException(const char* file, int line, const string& r) :
-    Exception(file, line),
+    ExceptionHelper<ParseException>(file, line),
     reason(r)
 {
 }
@@ -868,12 +856,6 @@ ParseException::ice_clone() const
 }
 #endif
 
-void
-ParseException::ice_throw() const
-{
-    throw *this;
-}
-
 #ifdef ICE_USE_OPENSSL
 DistinguishedName::DistinguishedName(X509NAME* name) : _rdns(RFC2253::parseStrict(convertX509NameToString(name)))
 {