You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2018/04/26 02:49:57 UTC
incubator-weex git commit: [WEEX-306][ios] resolve the naming
conflicts between the WXLogLevel naming and the Wechat SDK.
Repository: incubator-weex
Updated Branches:
refs/heads/master b4d8ecbb1 -> 0e30c5081
[WEEX-306][ios] resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.
Note: Add the ‘#define WXLogLevel WeexLogLevel’ macro in the WXLog.h file and rename the WXLogLevel to WeexLogLevel to resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.
[WEEX-306][ios] resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.
Note: Add the ‘#define WXLogLevel WeexLogLevel’ macro in the WXLog.h file and rename the WXLogLevel to WeexLogLevel to resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.
Revert "[WEEX-306][ios] resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK."
This reverts commit 32101169d4ff9dbe3549388c92739392420e9d4b.
close #1130
[WEEX-306][ios] resolve the naming conflicts WXLogLevel
Note: Add the ‘#define WXLogLevel WeexLogLevel’ macro in the WXLog.h file and rename the WXLogLevel to WeexLogLevel, to resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0e30c508
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0e30c508
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0e30c508
Branch: refs/heads/master
Commit: 0e30c508143ff674915af60629e9cbb24245f963
Parents: b4d8ecb
Author: xionghuayu <xi...@benmu-health.com>
Authored: Wed Apr 25 21:54:23 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 26 10:49:11 2018 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Utility/WXLog.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0e30c508/ios/sdk/WeexSDK/Sources/Utility/WXLog.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXLog.h b/ios/sdk/WeexSDK/Sources/Utility/WXLog.h
index 7922a70..b4ba21f 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXLog.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXLog.h
@@ -19,6 +19,8 @@
#import <Foundation/Foundation.h>
+#define WXLogLevel WeexLogLevel
+
typedef NS_ENUM(NSInteger, WXLogFlag) {
WXLogFlagError = 1 << 0,
WXLogFlagWarning = 1 << 1,
@@ -30,7 +32,7 @@ typedef NS_ENUM(NSInteger, WXLogFlag) {
/**
* Use Log levels to filter logs.
*/
-typedef NS_ENUM(NSUInteger, WXLogLevel){
+typedef NS_ENUM(NSUInteger, WeexLogLevel){
/**
* No logs
*/