summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/Certificate.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-07-22 17:09:25 -0400
committerBernard Normier <bernard@zeroc.com>2016-07-22 17:09:25 -0400
commit752e06b4eb63abb8a30bb958802eaedda72d3806 (patch)
tree7c2348544d202c310a55a62629abc4025daa03a5 /cpp/src/IceSSL/Certificate.cpp
parentDisable VS 2015 update 3 optimizer (diff)
downloadice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.bz2
ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.xz
ice-752e06b4eb63abb8a30bb958802eaedda72d3806.zip
Added ICE_BUILDING_SRC to make builds
Ice::Dispatcher and Ice::LocalObject are now hidden with C++11 Reworked C++11 exception ice_clone, added ExceptionHelper + other C++ cleanups
Diffstat (limited to 'cpp/src/IceSSL/Certificate.cpp')
-rwxr-xr-xcpp/src/IceSSL/Certificate.cpp26
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)))
{