X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/b1ab9ed8d0e0f1c3b66d7daa8fd5564444c56195..e3d3b979fd185d8303f28a937baa53a187fb8c7d:/libsecurity_utilities/lib/cfutilities.h

diff --git a/libsecurity_utilities/lib/cfutilities.h b/libsecurity_utilities/lib/cfutilities.h
index 72900d9b..dd1a7e8b 100644
--- 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/SecBase.h>
 #undef check
 
 
@@ -276,7 +276,7 @@ Number cfNumber(CFNumberRef number)
 {
 	typename CFNumberTraits<Number>::ValueType value;
 	if (CFNumberGetValue(number, CFNumberTraits<Number>::cfnType, &value))
-		return value;
+		return (Number)value;
 	else
 		CFError::throwMe();
 }
@@ -479,14 +479,14 @@ public:
 	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>
-	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)
@@ -568,7 +568,7 @@ CFToVector<VectorBase, CFRefType, convert>::CFToVector(CFArrayRef arrayRef)
         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)));