Security-55471.14.18.tar.gz

[apple/security.git] / libsecurity_utilities / lib / seccfobject.cpp

diff --git a/libsecurity_utilities/lib/seccfobject.cpp b/libsecurity_utilities/lib/seccfobject.cpp
index 537c086260e00ce323c096672139d5d06f719685..43b716b754f37492b76eedca440bc3d9c000f802 100644 (file)
--- a/libsecurity_utilities/lib/seccfobject.cpp
+++ b/libsecurity_utilities/lib/seccfobject.cpp
@@ -45,7 +45,7 @@ SecPointerBase::SecPointerBase(const SecPointerBase& p)
 static void CheckForRelease(SecCFObject* ptr)
 {
        CFTypeRef tr = ptr->operator CFTypeRef();
-       int retainCount = CFGetRetainCount(tr);
+       CFIndex retainCount = CFGetRetainCount(tr);
        if (retainCount == 1 || retainCount == -1)
        {
                ptr->aboutToDestruct();
@@ -159,7 +159,7 @@ SecCFObject::allocate(size_t size, const CFClass &cfclass) throw(std::bad_alloc)
 
        if (SECURITY_DEBUG_SEC_CREATE_ENABLED()) {
                const CFRuntimeClass *rtc = _CFRuntimeGetClassWithTypeID(cfclass.typeID);
-               SECURITY_DEBUG_SEC_CREATE(q, rtc ? (char *)rtc->className : NULL, cfclass.typeID);
+               SECURITY_DEBUG_SEC_CREATE(q, rtc ? (char *)rtc->className : NULL, (unsigned int)cfclass.typeID);
        }
        return q;
 }
@@ -261,3 +261,10 @@ SecCFObject::getMutexForObject()
 {
        return NULL; // we only worry about descendants of KeychainImpl and ItemImpl
 }
+
+
+
+bool SecCFObject::mayDelete()
+{
+    return true;
+}