X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/b54c578e17e9bcbd74aa30ea75e25e955b9a6205..refs/heads/master:/OSX/libsecurity_keychain/lib/KeyItem.cpp?ds=sidebyside

diff --git a/OSX/libsecurity_keychain/lib/KeyItem.cpp b/OSX/libsecurity_keychain/lib/KeyItem.cpp
index 6bec5672..1f079ff5 100644
--- a/OSX/libsecurity_keychain/lib/KeyItem.cpp
+++ b/OSX/libsecurity_keychain/lib/KeyItem.cpp
@@ -75,7 +75,7 @@ KeyItem *KeyItem::optional(SecKeyRef ptr)
     }
 }
 
-KeyItem::operator CFTypeRef() const throw()
+KeyItem::operator CFTypeRef() const _NOEXCEPT
 {
     StMaybeLock<Mutex> _(this->getMutexForObject());
 
@@ -758,8 +758,8 @@ KeyItem::createPair(
             pubKeyHash.set(*pubKeyHashData);
             passThrough.allocator().free(pubKeyHashData);
 
-            auto_ptr<string> privDescription;
-            auto_ptr<string> pubDescription;
+            unique_ptr<string> privDescription;
+            unique_ptr<string> pubDescription;
             try {
                 privDescription.reset(new string(initialAccess->promptDescription()));
                 pubDescription.reset(new string(initialAccess->promptDescription()));
@@ -997,8 +997,8 @@ KeyItem::importPair(
 		csp.allocator().free(cssmData->Data);
 		csp.allocator().free(cssmData);
 
-		auto_ptr<string>privDescription;
-		auto_ptr<string>pubDescription;
+		unique_ptr<string>privDescription;
+		unique_ptr<string>pubDescription;
 		try {
 			privDescription.reset(new string(initialAccess->promptDescription()));
 			pubDescription.reset(new string(initialAccess->promptDescription()));