修复Objective-C C++混编导致的问题

Author: erichmzhang

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 5.1.2    
+- 修复C++混编情况下的问题
+
 # 5.1.1
 - 修复了一些问题
 

QCloudCOSXML.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
-  s.version          = "5.1.1"
+  s.version          = "5.1.2"
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
   s.homepage         = "https://cloud.tencent.com/"
@@ -9,5 +9,5 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
   s.source_files = 'QCloudCOSXML/Classes/**/*'
-  s.dependency 'QCloudCore','5.1.1'
+  s.dependency 'QCloudCore','5.1.2'
 end

QCloudCOSXML/Classes/auto-generation/QCloudLifecycleRuleFilter.h

@@ -32,16 +32,17 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface QCloudLifecycleRuleFilter : NSObject
 /**
-指定规则所适用的前缀。匹配前缀的对象受该规则影响。
-*/
+ 指定规则所适用的前缀。匹配前缀的对象受该规则影响。
+ */
 @property (strong, nonatomic) NSString *prefix;
 /**
-标签，Tag 可以有零个或者多个
-*/
+ 标签，Tag 可以有零个或者多个
+ */
 @property (strong, nonatomic) NSString *tag;
 /**
-用于组合 Prefix 与 Tag
-*/
-@property (strong, nonatomic) QCloudLifecycleRuleFilterAnd *and;
+ 用于组合 Prefix 与 Tag
+ */
+@property (strong, nonatomic) QCloudLifecycleRuleFilterAnd *ruleFilterAnd;
 @end
 NS_ASSUME_NONNULL_END
+

QCloudCOSXML/Classes/auto-generation/QCloudLifecycleRuleFilterAnd.m

@@ -1,6 +1,6 @@
 //
-//  QCloudLifecycleRuleFilterAnd.m
-//  QCloudLifecycleRuleFilterAnd
+//  QCloudLifecycleRuleFilter.m
+//  QCloudLifecycleRuleFilter
 //
 //  Created by tencent
 //  Copyright (c) 2015年 tencent. All rights reserved.
@@ -24,29 +24,30 @@
 //
 
 
-#import "QCloudLifecycleRuleFilterAnd.h"
+#import "QCloudLifecycleRuleFilter.h"
 
-#import "QCloudLifecycleTag.h"
+#import "QCloudLifecycleRuleFilterAnd.h"
 
 
 NS_ASSUME_NONNULL_BEGIN
-@implementation QCloudLifecycleRuleFilterAnd
+@implementation QCloudLifecycleRuleFilter
 
 
 
 + (NSDictionary *)modelCustomPropertyMapper
 {
-  return @{
-      @"prefix" :@"Prefix",
-      @"tag" :@"Tag",
-  };
+    return @{
+             @"prefix" :@"Prefix",
+             @"tag" :@"Tag",
+             @"ruleFilterAnd" :@"And",
+             };
 }
 
 
 - (BOOL)modelCustomTransformToDictionary:(NSMutableDictionary *)dic
 {
-
-
+    
+    
     return YES;
 }
 
@@ -56,11 +57,12 @@ - (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dic
         return dic;
     }
     NSMutableDictionary* transfromDic = [NSMutableDictionary dictionaryWithDictionary:dic];
-
+    
     return transfromDic;
 }
 
 @end
 
 
 NS_ASSUME_NONNULL_END
+

QCloudCore.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "QCloudCore"
-  s.version          = "5.1.1"
+  s.version          = "5.1.2"
   s.summary          = "QCloudCore--腾讯云iOS-SDK Foundation"
 
 # This description is used to generate tags and improve search results.