Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_utilities / lib / cfutilities.h

diff --git a/libsecurity_utilities/lib/cfutilities.h b/libsecurity_utilities/lib/cfutilities.h
index 72900d9b73b3ad04e2686e256597519514a9f57e..dd1a7e8bcef94dcf06fba039dbe7b1a447e980fd 100644 (file)
--- a/libsecurity_utilities/lib/cfutilities.h
+++ b/libsecurity_utilities/lib/cfutilities.h
@@ -32,7 +32,7 @@
 #include <security_utilities/globalizer.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <algorithm>
 #include <security_utilities/globalizer.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <algorithm>

-
+#include <Security/SecBase.h>

 #undef check
 
 
 #undef check
 
 


@@ -276,7 +276,7 @@ Number cfNumber(CFNumberRef number)
 {
        typename CFNumberTraits<Number>::ValueType value;
        if (CFNumberGetValue(number, CFNumberTraits<Number>::cfnType, &value))
 {
        typename CFNumberTraits<Number>::ValueType value;
        if (CFNumberGetValue(number, CFNumberTraits<Number>::cfnType, &value))

-               return value;
+               return (Number)value;

        else
                CFError::throwMe();
 }
        else
                CFError::throwMe();
 }


@@ -479,14 +479,14 @@ public:
        CFTypeRef get(const char *key)          { return CFDictionaryGetValue(*this, CFTempString(key)); }
        
        template <class CFType>
        CFTypeRef get(const char *key)          { return CFDictionaryGetValue(*this, CFTempString(key)); }
        
        template <class CFType>

-       CFType get(CFStringRef key, OSStatus err = noErr) const
+       CFType get(CFStringRef key, OSStatus err = errSecSuccess) const

        {
                CFTypeRef elem = CFDictionaryGetValue(*this, key);
                return CFRef<CFType>::check(elem, err ? err : mDefaultError);
        }
        
        template <class CFType>
        {
                CFTypeRef elem = CFDictionaryGetValue(*this, key);
                return CFRef<CFType>::check(elem, err ? err : mDefaultError);
        }
        
        template <class CFType>

-       CFType get(const char *key, OSStatus err = noErr) const
+       CFType get(const char *key, OSStatus err = errSecSuccess) const

        { return get<CFType>(CFTempString(key), err); }
        
        void apply(CFDictionaryApplierFunction func, void *context)
        { return get<CFType>(CFTempString(key), err); }
        
        void apply(CFDictionaryApplierFunction func, void *context)


@@ -568,7 +568,7 @@ CFToVector<VectorBase, CFRefType, convert>::CFToVector(CFArrayRef arrayRef)
         mCount = 0;
         mVector = NULL;
     } else {
         mCount = 0;
         mVector = NULL;
     } else {

-        mCount = CFArrayGetCount(arrayRef);
+        mCount = (UInt32)CFArrayGetCount(arrayRef);

         mVector = new VectorBase[mCount];
         for (UInt32 n = 0; n < mCount; n++)
             mVector[n] = convert(CFRefType(CFArrayGetValueAtIndex(arrayRef, n)));
         mVector = new VectorBase[mCount];
         for (UInt32 n = 0; n < mCount; n++)
             mVector[n] = convert(CFRefType(CFArrayGetValueAtIndex(arrayRef, n)));