Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_cdsa_client / lib / cssmclient.h

diff --git a/OSX/libsecurity_cdsa_client/lib/cssmclient.h b/OSX/libsecurity_cdsa_client/lib/cssmclient.h
index 9b0033829b5fdac72659e273f7e97ad75b104b03..a7bc57ea6989021becd05a1a75d48bcf98afe0c1 100644 (file)
--- a/OSX/libsecurity_cdsa_client/lib/cssmclient.h
+++ b/OSX/libsecurity_cdsa_client/lib/cssmclient.h
@@ -65,7 +65,7 @@ private:
 //
 class Error : public CssmError {
 public:
 //
 class Error : public CssmError {
 public:

-       Error(CSSM_RETURN err) : CssmError(err) { }
+       Error(CSSM_RETURN err) : CssmError(err, false) { }

        virtual const char *what () const throw();
        
        enum {
        virtual const char *what () const throw();
        
        enum {


@@ -103,6 +103,7 @@ protected:
        bool mActive;                                   // loaded, attached, etc.
     RecursiveMutex mActivateMutex;
        mutable Allocator *mAllocator; // allocator hierarchy (NULL => TBD)
        bool mActive;                                   // loaded, attached, etc.
     RecursiveMutex mActivateMutex;
        mutable Allocator *mAllocator; // allocator hierarchy (NULL => TBD)

+    mutable RecursiveMutex mAllocatorMutex; // protects allocator creation

        
        template <class Obj> Obj parent() const
        { assert(mParent); return Obj(static_cast<typename Obj::Impl *>(&(*mParent))); }
        
        template <class Obj> Obj parent() const
        { assert(mParent); return Obj(static_cast<typename Obj::Impl *>(&(*mParent))); }