Convert the codebase to Objective-C++ (#1206)

* Convert the codebase to Objective-C++ throughout. One language is better than two. * Put it back * Fix linker * Point explicitly to updated Weaver to unblock build * Revert "Point explicitly to updated Weaver to unblock build" This reverts commit fdc2529. * Revert "Fix linker" This reverts commit 7be25f9. * Add in the frameworks * no message * Address spec lint warnings * Fix tvos build * Put that back * Address Michael's review * Add comment to kick CI
TextureGroup · Nov 2, 2018 · d0ba092 · d0ba092
1 parent 7ccdcb9
commit d0ba092
Show file tree

Hide file tree

Showing 155 changed files with 841 additions and 846 deletions.
diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -70,6 +70,7 @@
 - Correct linePositionModifier behavior [Michael Schneider](https://github.com/maicki)[#1192] (https://github.com/TextureGroup/Texture/pull/1192)
 - Tweak a11y label aggregation behavior to enable container label overrides [Michael Schneider](https://github.com/maicki)[#1199] (https://github.com/TextureGroup/Texture/pull/1199)
 - Fix logic cleaning data if delegate / dataSource changes and bring over logic to ASTableView [Michael Schneider](https://github.com/maicki)[#1200] (https://github.com/TextureGroup/Texture/pull/1200)
+- Standardize the code base on Objective-C++. We will still not leak any C++ into public headers, however. [Adlai Holler](https://github.com/Adlai-Holler)
 
 ## 2.7
 - Fix pager node for interface coalescing. [Max Wang](https://github.com/wsdwsd0829) [#877](https://github.com/TextureGroup/Texture/pull/877)

diff --git a/Source/ASCGImageBuffer.m → Source/ASCGImageBuffer.mm b/Source/ASCGImageBuffer.m → Source/ASCGImageBuffer.mm
@@ -1,5 +1,5 @@
 //
-//  ASCGImageBuffer.m
+//  ASCGImageBuffer.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/Source/ASCollections.m → Source/ASCollections.mm b/Source/ASCollections.m → Source/ASCollections.mm
@@ -1,12 +1,12 @@
 //
-//  ASCollections.m
+//  ASCollections.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASCollections.h"
+#import <AsyncDisplayKit/ASCollections.h>
 
 /**
  * A private allocator that signals to our retain callback to skip the retain.

diff --git a/Source/ASConfiguration.m → Source/ASConfiguration.mm b/Source/ASConfiguration.m → Source/ASConfiguration.mm
@@ -1,5 +1,5 @@
 //
-//  ASConfiguration.m
+//  ASConfiguration.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/Source/ASConfigurationInternal.m → Source/ASConfigurationInternal.mm b/Source/ASConfigurationInternal.m → Source/ASConfigurationInternal.mm
@@ -1,5 +1,5 @@
 //
-//  ASConfigurationInternal.m
+//  ASConfigurationInternal.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/Source/ASDisplayNode+Convenience.m → Source/ASDisplayNode+Convenience.mm b/Source/ASDisplayNode+Convenience.m → Source/ASDisplayNode+Convenience.mm
@@ -1,5 +1,5 @@
 //
-//  ASDisplayNode+Convenience.m
+//  ASDisplayNode+Convenience.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/ASExperimentalFeatures.m → Source/ASExperimentalFeatures.mm b/Source/ASExperimentalFeatures.m → Source/ASExperimentalFeatures.mm
@@ -1,5 +1,5 @@
 //
-//  ASExperimentalFeatures.m
+//  ASExperimentalFeatures.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/Source/ASNavigationController.m → Source/ASNavigationController.mm b/Source/ASNavigationController.m → Source/ASNavigationController.mm
@@ -1,5 +1,5 @@
 //
-//  ASNavigationController.m
+//  ASNavigationController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/ASNetworkImageLoadInfo.m → Source/ASNetworkImageLoadInfo.mm b/Source/ASNetworkImageLoadInfo.m → Source/ASNetworkImageLoadInfo.mm
@@ -1,5 +1,5 @@
 //
-//  ASNetworkImageLoadInfo.m
+//  ASNetworkImageLoadInfo.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/Source/ASPagerFlowLayout.m → Source/ASPagerFlowLayout.mm b/Source/ASPagerFlowLayout.m → Source/ASPagerFlowLayout.mm
@@ -1,5 +1,5 @@
 //
-//  ASPagerFlowLayout.m
+//  ASPagerFlowLayout.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/ASPagerNode.m → Source/ASPagerNode.mm b/Source/ASPagerNode.m → Source/ASPagerNode.mm
@@ -1,5 +1,5 @@
 //
-//  ASPagerNode.m
+//  ASPagerNode.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/ASTabBarController.m → Source/ASTabBarController.mm b/Source/ASTabBarController.m → Source/ASTabBarController.mm
@@ -1,5 +1,5 @@
 //
-//  ASTabBarController.m
+//  ASTabBarController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/ASVideoPlayerNode.h b/Source/ASVideoPlayerNode.h
@@ -216,4 +216,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 NS_ASSUME_NONNULL_END
-#endif
+#endif  // TARGET_OS_IOS
diff --git a/Source/ASVisibilityProtocols.m → Source/ASVisibilityProtocols.mm b/Source/ASVisibilityProtocols.m → Source/ASVisibilityProtocols.mm
@@ -1,5 +1,5 @@
 //
-//  ASVisibilityProtocols.m
+//  ASVisibilityProtocols.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/AsyncDisplayKit+IGListKitMethods.m → Source/AsyncDisplayKit+IGListKitMethods.mm b/Source/AsyncDisplayKit+IGListKitMethods.m → Source/AsyncDisplayKit+IGListKitMethods.mm
diff --git a/Source/Base/ASAssert.m → Source/Base/ASAssert.mm b/Source/Base/ASAssert.m → Source/Base/ASAssert.mm
@@ -1,5 +1,5 @@
 //
-//  ASAssert.m
+//  ASAssert.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
@@ -39,19 +39,19 @@ static pthread_key_t ASMainThreadAssertionsDisabledKey() {
 }
 
 BOOL ASMainThreadAssertionsAreDisabled() {
-  return (pthread_getspecific(ASMainThreadAssertionsDisabledKey()) > 0);
+  return (nullptr != pthread_getspecific(ASMainThreadAssertionsDisabledKey()));
 }
 
 void ASPushMainThreadAssertionsDisabled() {
   let key = ASMainThreadAssertionsDisabledKey();
-  let oldVal = pthread_getspecific(key);
-  pthread_setspecific(key, oldVal + 1);
+  let oldVal = (intptr_t)pthread_getspecific(key);
+  pthread_setspecific(key, (void *)(oldVal + 1));
 }
 
 void ASPopMainThreadAssertionsDisabled() {
   let key = ASMainThreadAssertionsDisabledKey();
-  let oldVal = pthread_getspecific(key);
-  pthread_setspecific(key, oldVal - 1);
+  let oldVal = (intptr_t)pthread_getspecific(key);
+  pthread_setspecific(key, (void *)(oldVal - 1));
   ASDisplayNodeCAssert(oldVal > 0, @"Attempt to pop thread assertion-disabling without corresponding push.");
 }
 

diff --git a/Source/Base/ASBaseDefines.h b/Source/Base/ASBaseDefines.h
@@ -12,6 +12,7 @@
 #define AS_EXTERN FOUNDATION_EXTERN
 #define unowned __unsafe_unretained
 
+// TODO: Remove these now that we're all-C++.
 #if defined(__cplusplus)
 # define var auto
 # define let const auto

diff --git a/Source/Base/ASDisplayNode+Ancestry.m → Source/Base/ASDisplayNode+Ancestry.mm b/Source/Base/ASDisplayNode+Ancestry.m → Source/Base/ASDisplayNode+Ancestry.mm
@@ -1,5 +1,5 @@
 //
-//  ASDisplayNode+Ancestry.m
+//  ASDisplayNode+Ancestry.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Base/ASLog.m → Source/Base/ASLog.mm b/Source/Base/ASLog.m → Source/Base/ASLog.mm
@@ -1,5 +1,5 @@
 //
-//  ASLog.m
+//  ASLog.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/Source/Debug/AsyncDisplayKit+Debug.m → Source/Debug/AsyncDisplayKit+Debug.mm b/Source/Debug/AsyncDisplayKit+Debug.m → Source/Debug/AsyncDisplayKit+Debug.mm
@@ -1,5 +1,5 @@
 //
-//  AsyncDisplayKit+Debug.m
+//  AsyncDisplayKit+Debug.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Debug/AsyncDisplayKit+Tips.m → Source/Debug/AsyncDisplayKit+Tips.mm b/Source/Debug/AsyncDisplayKit+Tips.m → Source/Debug/AsyncDisplayKit+Tips.mm
@@ -1,13 +1,13 @@
 //
-//  AsyncDisplayKit+Tips.m
+//  AsyncDisplayKit+Tips.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
 //  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "AsyncDisplayKit+Tips.h"
+#import <AsyncDisplayKit/AsyncDisplayKit+Tips.h>
 #import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
 
 @implementation ASDisplayNode (Tips)

diff --git a/Source/Details/ASBatchContext.m → Source/Details/ASBatchContext.mm b/Source/Details/ASBatchContext.m → Source/Details/ASBatchContext.mm
@@ -1,5 +1,5 @@
 //
-//  ASBatchContext.m
+//  ASBatchContext.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/.../Details/ASCollectionFlowLayoutDelegate.m → ...Details/ASCollectionFlowLayoutDelegate.mm b/.../Details/ASCollectionFlowLayoutDelegate.m → ...Details/ASCollectionFlowLayoutDelegate.mm
@@ -1,5 +1,5 @@
 //
-//  ASCollectionFlowLayoutDelegate.m
+//  ASCollectionFlowLayoutDelegate.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASCollectionLayoutContext.m → Source/Details/ASCollectionLayoutContext.mm b/Source/Details/ASCollectionLayoutContext.m → Source/Details/ASCollectionLayoutContext.mm
@@ -1,5 +1,5 @@
 //
-//  ASCollectionLayoutContext.m
+//  ASCollectionLayoutContext.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/...etails/ASCollectionViewLayoutController.m → ...tails/ASCollectionViewLayoutController.mm b/...etails/ASCollectionViewLayoutController.m → ...tails/ASCollectionViewLayoutController.mm
@@ -1,5 +1,5 @@
 //
-//  ASCollectionViewLayoutController.m
+//  ASCollectionViewLayoutController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/...Details/ASCollectionViewLayoutInspector.m → ...etails/ASCollectionViewLayoutInspector.mm b/...Details/ASCollectionViewLayoutInspector.m → ...etails/ASCollectionViewLayoutInspector.mm
@@ -1,5 +1,5 @@
 //
-//  ASCollectionViewLayoutInspector.m
+//  ASCollectionViewLayoutInspector.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASDelegateProxy.m → Source/Details/ASDelegateProxy.mm b/Source/Details/ASDelegateProxy.m → Source/Details/ASDelegateProxy.mm
@@ -1,5 +1,5 @@
 //
-//  ASDelegateProxy.m
+//  ASDelegateProxy.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASElementMap.m → Source/Details/ASElementMap.mm b/Source/Details/ASElementMap.m → Source/Details/ASElementMap.mm
@@ -1,13 +1,13 @@
 //
-//  ASElementMap.m
+//  ASElementMap.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
 //  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASElementMap.h"
+#import <AsyncDisplayKit/ASElementMap.h>
 #import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>

diff --git a/Source/Details/ASGraphicsContext.m → Source/Details/ASGraphicsContext.mm b/Source/Details/ASGraphicsContext.m → Source/Details/ASGraphicsContext.mm
@@ -1,12 +1,12 @@
 //
-//  ASGraphicsContext.m
+//  ASGraphicsContext.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASGraphicsContext.h"
+#import <AsyncDisplayKit/ASGraphicsContext.h>
 #import <AsyncDisplayKit/ASCGImageBuffer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASConfigurationInternal.h>

diff --git a/Source/Details/ASHashing.m → Source/Details/ASHashing.mm b/Source/Details/ASHashing.m → Source/Details/ASHashing.mm
@@ -1,5 +1,5 @@
 //
-//  ASHashing.m
+//  ASHashing.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/...ails/ASImageContainerProtocolCategories.m → ...ils/ASImageContainerProtocolCategories.mm b/...ails/ASImageContainerProtocolCategories.m → ...ils/ASImageContainerProtocolCategories.mm
@@ -1,5 +1,5 @@
 //
-//  ASImageContainerProtocolCategories.m
+//  ASImageContainerProtocolCategories.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/...etails/ASMutableAttributedStringBuilder.m → ...tails/ASMutableAttributedStringBuilder.mm b/...etails/ASMutableAttributedStringBuilder.m → ...tails/ASMutableAttributedStringBuilder.mm
@@ -1,5 +1,5 @@
 //
-//  ASMutableAttributedStringBuilder.m
+//  ASMutableAttributedStringBuilder.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASObjectDescriptionHelpers.m → Source/Details/ASObjectDescriptionHelpers.mm b/Source/Details/ASObjectDescriptionHelpers.m → Source/Details/ASObjectDescriptionHelpers.mm
@@ -1,5 +1,5 @@
 //
-//  ASObjectDescriptionHelpers.m
+//  ASObjectDescriptionHelpers.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASPINRemoteImageDownloader.m → Source/Details/ASPINRemoteImageDownloader.mm b/Source/Details/ASPINRemoteImageDownloader.m → Source/Details/ASPINRemoteImageDownloader.mm
@@ -1,5 +1,5 @@
 //
-//  ASPINRemoteImageDownloader.m
+//  ASPINRemoteImageDownloader.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASPageTable.m → Source/Details/ASPageTable.mm b/Source/Details/ASPageTable.m → Source/Details/ASPageTable.mm
@@ -1,5 +1,5 @@
 //
-//  ASPageTable.m
+//  ASPageTable.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/...e/Details/ASPhotosFrameworkImageRequest.m → .../Details/ASPhotosFrameworkImageRequest.mm b/...e/Details/ASPhotosFrameworkImageRequest.m → .../Details/ASPhotosFrameworkImageRequest.mm
@@ -1,5 +1,5 @@
 //
-//  ASPhotosFrameworkImageRequest.m
+//  ASPhotosFrameworkImageRequest.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASRecursiveUnfairLock.m → Source/Details/ASRecursiveUnfairLock.mm b/Source/Details/ASRecursiveUnfairLock.m → Source/Details/ASRecursiveUnfairLock.mm
@@ -1,5 +1,5 @@
 //
-//  ASRecursiveUnfairLock.m
+//  ASRecursiveUnfairLock.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

diff --git a/Source/Details/ASScrollDirection.m → Source/Details/ASScrollDirection.mm b/Source/Details/ASScrollDirection.m → Source/Details/ASScrollDirection.mm
@@ -1,5 +1,5 @@
 //
-//  ASScrollDirection.m
+//  ASScrollDirection.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASTableLayoutController.m → Source/Details/ASTableLayoutController.mm b/Source/Details/ASTableLayoutController.m → Source/Details/ASTableLayoutController.mm
@@ -1,5 +1,5 @@
 //
-//  ASTableLayoutController.m
+//  ASTableLayoutController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASTraceEvent.m → Source/Details/ASTraceEvent.mm b/Source/Details/ASTraceEvent.m → Source/Details/ASTraceEvent.mm
@@ -1,5 +1,5 @@
 //
-//  ASTraceEvent.m
+//  ASTraceEvent.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASTraitCollection.m → Source/Details/ASTraitCollection.mm b/Source/Details/ASTraitCollection.m → Source/Details/ASTraitCollection.mm
@@ -1,5 +1,5 @@
 //
-//  ASTraitCollection.m
+//  ASTraitCollection.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASWeakProxy.m → Source/Details/ASWeakProxy.mm b/Source/Details/ASWeakProxy.m → Source/Details/ASWeakProxy.mm
@@ -1,5 +1,5 @@
 //
-//  ASWeakProxy.m
+//  ASWeakProxy.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/ASWeakSet.m → Source/Details/ASWeakSet.mm b/Source/Details/ASWeakSet.m → Source/Details/ASWeakSet.mm
@@ -1,5 +1,5 @@
 //
-//  ASWeakSet.m
+//  ASWeakSet.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/Source/Details/CoreGraphics+ASConvenience.m b/Source/Details/CoreGraphics+ASConvenience.m
diff --git a/Source/Details/NSIndexSet+ASHelpers.m → Source/Details/NSIndexSet+ASHelpers.mm b/Source/Details/NSIndexSet+ASHelpers.m → Source/Details/NSIndexSet+ASHelpers.mm
@@ -1,5 +1,5 @@
 //
-//  NSIndexSet+ASHelpers.m
+//  NSIndexSet+ASHelpers.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/...utableAttributedString+TextKitAdditions.m → ...tableAttributedString+TextKitAdditions.mm b/...utableAttributedString+TextKitAdditions.m → ...tableAttributedString+TextKitAdditions.mm
@@ -1,5 +1,5 @@
 //
-//  NSMutableAttributedString+TextKitAdditions.m
+//  NSMutableAttributedString+TextKitAdditions.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/...ansactions/_ASAsyncTransactionContainer.m → ...nsactions/_ASAsyncTransactionContainer.mm b/...ansactions/_ASAsyncTransactionContainer.m → ...nsactions/_ASAsyncTransactionContainer.mm
@@ -1,5 +1,5 @@
 //
-//  _ASAsyncTransactionContainer.m
+//  _ASAsyncTransactionContainer.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

diff --git a/...s/Transactions/_ASAsyncTransactionGroup.m → .../Transactions/_ASAsyncTransactionGroup.mm b/...s/Transactions/_ASAsyncTransactionGroup.m → .../Transactions/_ASAsyncTransactionGroup.mm
@@ -1,5 +1,5 @@
 //
-//  _ASAsyncTransactionGroup.m
+//  _ASAsyncTransactionGroup.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.