S3: Fix 64-bit builds
Make currentXMLELementContent / currentXMLElementStack setters public to allow use from subclasses without synthesizing again
Showing
5 changed files
with
4 additions
and
12 deletions
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | // Automatically set on build | 25 | // Automatically set on build |
| 26 | -NSString *ASIHTTPRequestVersion = @"v1.6.1-8 2010-04-12"; | 26 | +NSString *ASIHTTPRequestVersion = @"v1.6.1-9 2010-04-12"; |
| 27 | 27 | ||
| 28 | NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain"; | 28 | NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain"; |
| 29 | 29 |
| @@ -13,8 +13,6 @@ | @@ -13,8 +13,6 @@ | ||
| 13 | // Private stuff | 13 | // Private stuff |
| 14 | @interface ASIS3BucketRequest () | 14 | @interface ASIS3BucketRequest () |
| 15 | @property (retain, nonatomic) ASIS3BucketObject *currentObject; | 15 | @property (retain, nonatomic) ASIS3BucketObject *currentObject; |
| 16 | -@property (retain, nonatomic) NSString *currentXMLElementContent; | ||
| 17 | -@property (retain, nonatomic) NSMutableArray *currentXMLElementStack; | ||
| 18 | @property (retain) NSMutableArray *objects; | 16 | @property (retain) NSMutableArray *objects; |
| 19 | @property (retain) NSMutableArray *commonPrefixes; | 17 | @property (retain) NSMutableArray *commonPrefixes; |
| 20 | @property (assign) BOOL isTruncated; | 18 | @property (assign) BOOL isTruncated; |
| @@ -176,6 +174,5 @@ | @@ -176,6 +174,5 @@ | ||
| 176 | @synthesize maxResultCount; | 174 | @synthesize maxResultCount; |
| 177 | @synthesize delimiter; | 175 | @synthesize delimiter; |
| 178 | @synthesize isTruncated; | 176 | @synthesize isTruncated; |
| 179 | -@synthesize currentXMLElementContent; | 177 | + |
| 180 | -@synthesize currentXMLElementStack; | ||
| 181 | @end | 178 | @end |
| @@ -82,4 +82,6 @@ typedef enum _ASIS3ErrorType { | @@ -82,4 +82,6 @@ typedef enum _ASIS3ErrorType { | ||
| 82 | @property (retain) NSString *accessKey; | 82 | @property (retain) NSString *accessKey; |
| 83 | @property (retain) NSString *secretAccessKey; | 83 | @property (retain) NSString *secretAccessKey; |
| 84 | @property (retain) NSString *accessPolicy; | 84 | @property (retain) NSString *accessPolicy; |
| 85 | +@property (retain) NSString *currentXMLElementContent; | ||
| 86 | +@property (retain) NSMutableArray *currentXMLElementStack; | ||
| 85 | @end | 87 | @end |
| @@ -22,8 +22,6 @@ static NSDateFormatter *dateFormatter = nil; | @@ -22,8 +22,6 @@ static NSDateFormatter *dateFormatter = nil; | ||
| 22 | // Private stuff | 22 | // Private stuff |
| 23 | @interface ASIS3Request () | 23 | @interface ASIS3Request () |
| 24 | + (NSData *)HMACSHA1withKey:(NSString *)key forString:(NSString *)string; | 24 | + (NSData *)HMACSHA1withKey:(NSString *)key forString:(NSString *)string; |
| 25 | - @property (retain, nonatomic) NSString *currentXMLElementContent; | ||
| 26 | - @property (retain, nonatomic) NSMutableArray *currentXMLElementStack; | ||
| 27 | @end | 25 | @end |
| 28 | 26 | ||
| 29 | @implementation ASIS3Request | 27 | @implementation ASIS3Request |
| @@ -15,9 +15,6 @@ | @@ -15,9 +15,6 @@ | ||
| 15 | @property (retain, nonatomic) ASIS3Bucket *currentBucket; | 15 | @property (retain, nonatomic) ASIS3Bucket *currentBucket; |
| 16 | @property (retain, nonatomic) NSString *ownerID; | 16 | @property (retain, nonatomic) NSString *ownerID; |
| 17 | @property (retain, nonatomic) NSString *ownerName; | 17 | @property (retain, nonatomic) NSString *ownerName; |
| 18 | - | ||
| 19 | -@property (retain, nonatomic) NSMutableArray *currentXMLElementStack; | ||
| 20 | -@property (retain, nonatomic) NSString *currentXMLElementContent; | ||
| 21 | @end | 18 | @end |
| 22 | 19 | ||
| 23 | @implementation ASIS3ServiceRequest | 20 | @implementation ASIS3ServiceRequest |
| @@ -73,8 +70,6 @@ | @@ -73,8 +70,6 @@ | ||
| 73 | } | 70 | } |
| 74 | 71 | ||
| 75 | @synthesize buckets; | 72 | @synthesize buckets; |
| 76 | -@synthesize currentXMLElementContent; | ||
| 77 | -@synthesize currentXMLElementStack; | ||
| 78 | @synthesize currentBucket; | 73 | @synthesize currentBucket; |
| 79 | @synthesize ownerID; | 74 | @synthesize ownerID; |
| 80 | @synthesize ownerName; | 75 | @synthesize ownerName; |
-
Please register or login to post a comment