Skip to content

Commit 275fd3e

Browse files
Levi McCallumlevi
authored andcommitted
Include missing hash helpers implementation
1 parent bae3e3b commit 275fd3e

2 files changed

Lines changed: 32 additions & 2 deletions

File tree

AsyncDisplayKit.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@
162162
2577548A1BED252700737CA5 /* CKTextKitTailTruncater.h in Headers */ = {isa = PBXBuildFile; fileRef = 257754771BED252700737CA5 /* CKTextKitTailTruncater.h */; };
163163
2577548B1BED252700737CA5 /* CKTextKitTailTruncater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 257754781BED252700737CA5 /* CKTextKitTailTruncater.mm */; };
164164
2577548C1BED252700737CA5 /* CKTextKitTruncating.h in Headers */ = {isa = PBXBuildFile; fileRef = 257754791BED252700737CA5 /* CKTextKitTruncating.h */; };
165-
2577548E1BED278B00737CA5 /* CKEqualityHashHelpers.h in Sources */ = {isa = PBXBuildFile; fileRef = 2577548D1BED278B00737CA5 /* CKEqualityHashHelpers.h */; };
165+
257754911BED28F300737CA5 /* CKEqualityHashHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 2577548D1BED278B00737CA5 /* CKEqualityHashHelpers.h */; };
166+
257754921BED28F300737CA5 /* CKEqualityHashHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2577548F1BED289A00737CA5 /* CKEqualityHashHelpers.mm */; };
166167
2767E9411BB19BD600EA9B77 /* ASViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = ACC945A81BA9E7A0005E1FB8 /* ASViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
167168
2767E9421BB19BD600EA9B77 /* ASViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ACC945AA1BA9E7C1005E1FB8 /* ASViewController.m */; };
168169
2911485C1A77147A005D0878 /* ASControlNodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2911485B1A77147A005D0878 /* ASControlNodeTests.m */; };
@@ -619,6 +620,7 @@
619620
257754781BED252700737CA5 /* CKTextKitTailTruncater.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CKTextKitTailTruncater.mm; path = TextKit/CKTextKitTailTruncater.mm; sourceTree = "<group>"; };
620621
257754791BED252700737CA5 /* CKTextKitTruncating.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKTextKitTruncating.h; path = TextKit/CKTextKitTruncating.h; sourceTree = "<group>"; };
621622
2577548D1BED278B00737CA5 /* CKEqualityHashHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKEqualityHashHelpers.h; path = TextKit/CKEqualityHashHelpers.h; sourceTree = "<group>"; };
623+
2577548F1BED289A00737CA5 /* CKEqualityHashHelpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CKEqualityHashHelpers.mm; sourceTree = "<group>"; };
622624
2911485B1A77147A005D0878 /* ASControlNodeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASControlNodeTests.m; sourceTree = "<group>"; };
623625
292C59991A956527007E5DD6 /* ASLayoutRangeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutRangeType.h; sourceTree = "<group>"; };
624626
292C599A1A956527007E5DD6 /* ASRangeHandlerPreload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASRangeHandlerPreload.h; sourceTree = "<group>"; };
@@ -1102,6 +1104,7 @@
11021104
257754781BED252700737CA5 /* CKTextKitTailTruncater.mm */,
11031105
257754791BED252700737CA5 /* CKTextKitTruncating.h */,
11041106
2577548D1BED278B00737CA5 /* CKEqualityHashHelpers.h */,
1107+
2577548F1BED289A00737CA5 /* CKEqualityHashHelpers.mm */,
11051108
);
11061109
name = TextKit;
11071110
sourceTree = "<group>";
@@ -1187,6 +1190,7 @@
11871190
058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */,
11881191
058D0A6D195D05EC00B7D73C /* _ASAsyncTransactionGroup.h in Headers */,
11891192
058D0A72195D05F800B7D73C /* _ASCoreAnimationExtras.h in Headers */,
1193+
257754911BED28F300737CA5 /* CKEqualityHashHelpers.h in Headers */,
11901194
058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */,
11911195
058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */,
11921196
058D0A74195D05F800B7D73C /* _ASPendingState.h in Headers */,
@@ -1636,7 +1640,6 @@
16361640
2577547B1BED252700737CA5 /* CKTextKitAttributes.mm in Sources */,
16371641
430E7C911B4C23F100697A4C /* ASIndexPath.m in Sources */,
16381642
ACF6ED231B17843500DA7C62 /* ASInsetLayoutSpec.mm in Sources */,
1639-
2577548E1BED278B00737CA5 /* CKEqualityHashHelpers.h in Sources */,
16401643
ACF6ED4C1B17847A00DA7C62 /* ASInternalHelpers.mm in Sources */,
16411644
ACF6ED251B17843500DA7C62 /* ASLayout.mm in Sources */,
16421645
9C5FA3531B8F6ADF00A62714 /* ASLayoutOptions.mm in Sources */,
@@ -1651,6 +1654,7 @@
16511654
257754891BED252700737CA5 /* CKTextKitShadower.mm in Sources */,
16521655
ACF6ED2C1B17843500DA7C62 /* ASOverlayLayoutSpec.mm in Sources */,
16531656
0442850F1BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm in Sources */,
1657+
257754921BED28F300737CA5 /* CKEqualityHashHelpers.mm in Sources */,
16541658
055F1A3919ABD413004DAFF1 /* ASRangeController.mm in Sources */,
16551659
044285091BAA63FE00D16268 /* ASBatchFetching.m in Sources */,
16561660
292C59A11A956527007E5DD6 /* ASRangeHandlerPreload.mm in Sources */,
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright (c) 2014-present, Facebook, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the BSD-style license found in the
6+
* LICENSE file in the root directory of this source tree. An additional grant
7+
* of patent rights can be found in the PATENTS file in the same directory.
8+
*
9+
*/
10+
11+
#import "CKEqualityHashHelpers.h"
12+
13+
#import <functional>
14+
#import <objc/runtime.h>
15+
#import <stdio.h>
16+
#import <string>
17+
18+
NSUInteger CKIntegerArrayHash(const NSUInteger *subhashes, NSUInteger count)
19+
{
20+
uint64_t result = subhashes[0];
21+
for (int ii = 1; ii < count; ++ii) {
22+
result = CKHashCombine(result, subhashes[ii]);
23+
}
24+
return CKHash64ToNative(result);
25+
}
26+

0 commit comments

Comments
 (0)