X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/b04fe171f0375ecd5d8a24747ca1dff85720a0ca..refs/heads/master:/OSX/libsecurity_keychain/lib/Keychains.h?ds=inline

diff --git a/OSX/libsecurity_keychain/lib/Keychains.h b/OSX/libsecurity_keychain/lib/Keychains.h
index 7667b7ae..b33ae6a4 100644
--- a/OSX/libsecurity_keychain/lib/Keychains.h
+++ b/OSX/libsecurity_keychain/lib/Keychains.h
@@ -138,7 +138,6 @@ public:
 	Mutex* getKeychainMutex();
 	Mutex* getMutexForObject() const;
 
-    ReadWriteLock* getKeychainReadWriteLock();
 	void aboutToDestruct();
 
 	bool operator ==(const KeychainImpl &) const;
@@ -219,8 +218,8 @@ public:
 	const AccessCredentials *defaultCredentials();
 
 	// Only call these functions while holding globals().apiLock.
-	bool inCache() const throw() { return mInCache; }
-	void inCache(bool inCache) throw() { mInCache = inCache; }
+	bool inCache() const _NOEXCEPT { return mInCache; }
+	void inCache(bool inCache) _NOEXCEPT { mInCache = inCache; }
 	
 	void postEvent(SecKeychainEvent kcEvent, ItemImpl* item);
     void postEvent(SecKeychainEvent kcEvent, ItemImpl* item, PrimaryKey pk);
@@ -323,11 +322,6 @@ private:
     // creation/returning needs a mutex. You should only hold this if you're
     // copying or changing the mDb object.
     Mutex mDbMutex;
-
-    // Used to protect mDb across calls.
-    // Grab a read lock if you expect to read from this keychain in the future.
-    // The write lock is taken if we're replacing the database wholesale with something new.
-    ReadWriteLock mRWLock;
 };