[incubator-weex] branch master updated: Fix nullable annotation. (#2878)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jianhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git


The following commit(s) were added to refs/heads/master by this push:
     new 72b0bdb  Fix nullable annotation. (#2878)
72b0bdb is described below

commit 72b0bdb9b00cbf852328e03d91cf25608692c9e1
Author: wqyfavor <qi...@alibaba-inc.com>
AuthorDate: Wed Sep 4 14:09:37 2019 +0800

    Fix nullable annotation. (#2878)
---
 ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.h | 4 ++--
 ios/sdk/WeexSDK/Sources/WeexSDK.h                      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.h b/ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.h
index 31fa989..b4a263f 100644
--- a/ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.h
+++ b/ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.h
@@ -150,11 +150,11 @@ extern NSString* const VALUE_ERROR_CODE_DEFAULT;
 #pragma mark - called by IWXHttpAdapter implementer
 
 - (void) actionNetRequest;
-- (void) actionNetRequestResult:(bool)succeed withErrorCode:(NSString*)errorCode;
+- (void) actionNetRequestResult:(bool)succeed withErrorCode:(nullable NSString*)errorCode;
 
 #pragma mark - called by IWXImgLoaderAdapter implementer
 - (void) actionImgLoad;
-- (void) actionImgLoadResult:(bool)succeed withErrorCode:(NSString*)errorCode;
+- (void) actionImgLoadResult:(bool)succeed withErrorCode:(nullable NSString*)errorCode;
 
 #pragma mark record top5 errorMsg
 - (void) recordErrorMsg:(WXJSExceptionInfo *)exception;
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index 2956ea4..8e5f6f4 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -23,10 +23,10 @@ FOUNDATION_EXPORT double WeexSDKVersionNumber;
 
 FOUNDATION_EXPORT const unsigned char WeexSDKVersionString[];
 
-#import "style.h"
-#import "layout.h"
-#import "flex_enum.h"
-#import "eagle_bridge.h"
+#import <WeexSDK/style.h>
+#import <WeexSDK/layout.h>
+#import <WeexSDK/flex_enum.h>
+#import <WeexSDK/eagle_bridge.h>
 #import <WeexSDK/WXWebSocketHandler.h>
 #import <WeexSDK/WXVoiceOverModule.h>
 #import <WeexSDK/WXView.h>