Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / errors.cpp

diff --git a/OSX/libsecurity_utilities/lib/errors.cpp b/OSX/libsecurity_utilities/lib/errors.cpp
index 9c99aea556b9b3d15397a2b407721df5350a1d6c..5072da2f3fa6103e56ff169927b89a26e43a7432 100644 (file)
--- a/OSX/libsecurity_utilities/lib/errors.cpp
+++ b/OSX/libsecurity_utilities/lib/errors.cpp
@@ -60,7 +60,7 @@ CommonError::CommonError(const CommonError &source)
     strlcpy(whatBuffer, source.whatBuffer, whatBufferSize);
 }
 
-CommonError::~CommonError() throw ()
+CommonError::~CommonError() _NOEXCEPT
 {
 }
 
@@ -135,7 +135,7 @@ UnixError::UnixError(int err, bool suppresslogging) : error(err)
     }
 }
 
-const char *UnixError::what() const throw ()
+const char *UnixError::what() const _NOEXCEPT
 {
     return whatBuffer;
 }
@@ -175,7 +175,7 @@ MacOSError::MacOSError(int err) : error(err)
     }
 }
 
-const char *MacOSError::what() const throw ()
+const char *MacOSError::what() const _NOEXCEPT
 {
     return whatBuffer;
 }
@@ -199,6 +199,12 @@ int MacOSError::unixError() const
 void MacOSError::throwMe(int error)
 { throw MacOSError(error); }
 
+void MacOSError::throwMe(int error, char const *message, ...)
+{
+    // Ignoring the message for now, will do something with it later.
+    throw MacOSError(error);
+}
+
 MacOSError MacOSError::make(int error)
 { return MacOSError(error); }
 
@@ -213,7 +219,7 @@ CFError::CFError()
     LogBacktrace();
 }
 
-const char *CFError::what() const throw ()
+const char *CFError::what() const _NOEXCEPT
 { return "CoreFoundation error"; }
 
 OSStatus CFError::osStatus() const