Skip to content

Commit 696f344

Browse files
ejensenAdlai-Holler
authored andcommitted
Fix compilation warnings #trivial (TextureGroup#1132)
* Apply recommended warnings * Squelch designated initializer warning in ASViewController * Remove unused compiler flag clang: warning: argument unused during compilation: '-fno-objc-arc-exceptions' [-Wunused-command-line-argument] * Fix warning about overriding an instance variable within a category Instance method 'methodOverrides' in category from _ASDisplayView.o overrides method from class in ASDisplayNode.o
1 parent 71ef0fc commit 696f344

File tree

7 files changed

+23
-21
lines changed

7 files changed

+23
-21
lines changed

AsyncDisplayKit.xcodeproj/project.pbxproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,7 +2128,7 @@
21282128
isa = PBXProject;
21292129
attributes = {
21302130
CLASSPREFIX = AS;
2131-
LastUpgradeCheck = 0820;
2131+
LastUpgradeCheck = 0940;
21322132
ORGANIZATIONNAME = Pinterest;
21332133
TargetAttributes = {
21342134
057D02BE1AC0A66700C7AC3C = {
@@ -2586,6 +2586,7 @@
25862586
CLANG_WARN_COMMA = YES;
25872587
CLANG_WARN_CONSTANT_CONVERSION = YES;
25882588
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
2589+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
25892590
CLANG_WARN_EMPTY_BODY = YES;
25902591
CLANG_WARN_ENUM_CONVERSION = YES;
25912592
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -2618,7 +2619,9 @@
26182619
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
26192620
GCC_WARN_UNDECLARED_SELECTOR = YES;
26202621
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
2622+
GCC_WARN_UNKNOWN_PRAGMAS = YES;
26212623
GCC_WARN_UNUSED_FUNCTION = YES;
2624+
GCC_WARN_UNUSED_LABEL = YES;
26222625
GCC_WARN_UNUSED_VARIABLE = YES;
26232626
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
26242627
ONLY_ACTIVE_ARCH = YES;
@@ -2640,6 +2643,7 @@
26402643
CLANG_WARN_COMMA = YES;
26412644
CLANG_WARN_CONSTANT_CONVERSION = YES;
26422645
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
2646+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
26432647
CLANG_WARN_EMPTY_BODY = YES;
26442648
CLANG_WARN_ENUM_CONVERSION = YES;
26452649
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -2662,7 +2666,9 @@
26622666
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
26632667
GCC_WARN_UNDECLARED_SELECTOR = YES;
26642668
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
2669+
GCC_WARN_UNKNOWN_PRAGMAS = YES;
26652670
GCC_WARN_UNUSED_FUNCTION = YES;
2671+
GCC_WARN_UNUSED_LABEL = YES;
26662672
GCC_WARN_UNUSED_VARIABLE = YES;
26672673
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
26682674
SDKROOT = iphoneos;
@@ -2741,7 +2747,6 @@
27412747
OTHER_CFLAGS = (
27422748
"-Wundef",
27432749
"-fno-exceptions",
2744-
"-fno-objc-arc-exceptions",
27452750
);
27462751
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
27472752
PRODUCT_NAME = AsyncDisplayKit;
@@ -2774,7 +2779,6 @@
27742779
OTHER_CFLAGS = (
27752780
"-Wundef",
27762781
"-fno-exceptions",
2777-
"-fno-objc-arc-exceptions",
27782782
);
27792783
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
27802784
PRODUCT_NAME = AsyncDisplayKit;
@@ -2797,6 +2801,7 @@
27972801
CLANG_WARN_COMMA = YES;
27982802
CLANG_WARN_CONSTANT_CONVERSION = YES;
27992803
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
2804+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
28002805
CLANG_WARN_EMPTY_BODY = YES;
28012806
CLANG_WARN_ENUM_CONVERSION = YES;
28022807
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -2819,7 +2824,9 @@
28192824
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
28202825
GCC_WARN_UNDECLARED_SELECTOR = YES;
28212826
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
2827+
GCC_WARN_UNKNOWN_PRAGMAS = YES;
28222828
GCC_WARN_UNUSED_FUNCTION = YES;
2829+
GCC_WARN_UNUSED_LABEL = YES;
28232830
GCC_WARN_UNUSED_VARIABLE = YES;
28242831
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
28252832
SDKROOT = iphoneos;
@@ -2892,7 +2899,6 @@
28922899
OTHER_CFLAGS = (
28932900
"-Wundef",
28942901
"-fno-exceptions",
2895-
"-fno-objc-arc-exceptions",
28962902
);
28972903
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
28982904
PRODUCT_NAME = AsyncDisplayKit;

AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Source/ASDisplayNode.mm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,11 @@ - (void)setLayerBlock:(ASDisplayNodeLayerBlock)layerBlock
408408
setFlag(Synchronous, YES);
409409
}
410410

411+
- (ASDisplayNodeMethodOverrides)methodOverrides
412+
{
413+
return _methodOverrides;
414+
}
415+
411416
- (void)onDidLoad:(ASDisplayNodeDidLoadBlock)body
412417
{
413418
ASDN::MutexLocker l(__instanceLock__);

Source/ASViewController.mm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ @implementation ASViewController
2727
UIEdgeInsets _fallbackAdditionalSafeAreaInsets;
2828
}
2929

30+
#pragma clang diagnostic push
31+
#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
32+
3033
- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
3134
{
3235
if (!(self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
@@ -49,6 +52,8 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder
4952
return self;
5053
}
5154

55+
#pragma clang diagnostic pop
56+
5257
- (instancetype)initWithNode:(ASDisplayNode *)node
5358
{
5459
if (!(self = [super initWithNibName:nil bundle:nil])) {

Source/Details/_ASDisplayView.mm

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,6 @@
2121
#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
2222
#import <AsyncDisplayKit/ASViewController.h>
2323

24-
#pragma mark - ASDisplayNode
25-
26-
/**
27-
* Open access to the method overrides struct for ASDisplayView
28-
*/
29-
@implementation ASDisplayNode (ASDisplayNodeMethodOverrides_ASDisplayView)
30-
31-
- (ASDisplayNodeMethodOverrides)methodOverrides
32-
{
33-
return _methodOverrides;
34-
}
35-
36-
@end
37-
3824
#pragma mark - _ASDisplayViewMethodOverrides
3925

4026
typedef NS_OPTIONS(NSUInteger, _ASDisplayViewMethodOverrides)

Source/Private/ASDisplayNodeInternal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ AS_EXTERN NSString * const ASRenderingEngineDidDisplayNodesScheduledBeforeTimest
261261
@property (nullable, nonatomic, readonly) _ASDisplayLayer *asyncLayer;
262262

263263
/// Bitmask to check which methods an object overrides.
264-
@property (nonatomic, readonly) ASDisplayNodeMethodOverrides methodOverrides;
264+
- (ASDisplayNodeMethodOverrides)methodOverrides;
265265

266266
/**
267267
* Invoked before a call to setNeedsLayout to the underlying view

Texture.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
1616

1717
# Subspecs
1818
spec.subspec 'Core' do |core|
19-
core.compiler_flags = '-fno-exceptions -fno-objc-arc-exceptions'
19+
core.compiler_flags = '-fno-exceptions'
2020
core.public_header_files = [
2121
'Source/*.h',
2222
'Source/Details/**/*.h',

0 commit comments

Comments
 (0)