Merge pull request #14492 from compnerd/CFHashType

compnerd · web-flow · commit 94a35a1b4c01 · 2018-02-10T10:28:14.000-08:00
Shims: match the declared type for CF interfaces
diff --git a/stdlib/public/SwiftShims/CFHashingShims.h b/stdlib/public/SwiftShims/CFHashingShims.h
@@ -29,10 +29,10 @@ CF_INLINE CFHashCode __CFHashDouble(double d) {
     return (CFHashCode)(integralHash + (CFHashCode)((d - dInt) * ULONG_MAX));
 }
 
-CF_EXPORT CFHashCode CFHashBytes(uint8_t *_Nullable bytes, long len);
+CF_EXPORT CFHashCode CFHashBytes(uint8_t *_Nullable bytes, CFIndex len);
 
 
-CF_INLINE CFHashCode __CFHashBytes(uint8_t *_Nullable bytes, long len) {
+CF_INLINE CFHashCode __CFHashBytes(uint8_t *_Nullable bytes, CFIndex len) {
     return CFHashBytes(bytes, len);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ CF_INLINE CFHashCode __CFHashDouble(double d) {`
`29`	`29`	`return (CFHashCode)(integralHash + (CFHashCode)((d - dInt) * ULONG_MAX));`
`30`	`30`	`}`
`31`	`31`
`32`		`-CF_EXPORT CFHashCode CFHashBytes(uint8_t *_Nullable bytes, long len);`
	`32`	`+CF_EXPORT CFHashCode CFHashBytes(uint8_t *_Nullable bytes, CFIndex len);`
`33`	`33`
`34`	`34`
`35`		`-CF_INLINE CFHashCode __CFHashBytes(uint8_t *_Nullable bytes, long len) {`
	`35`	`+CF_INLINE CFHashCode __CFHashBytes(uint8_t *_Nullable bytes, CFIndex len) {`
`36`	`36`	`return CFHashBytes(bytes, len);`
`37`	`37`	`}`
`38`	`38`