Skip to content

Commit

Permalink
S3: Fix 64-bit builds
Browse files Browse the repository at this point in the history
Make currentXMLELementContent / currentXMLElementStack setters public to allow use from subclasses without synthesizing again
  • Loading branch information
pokeb committed Apr 12, 2010
1 parent 6a95751 commit f8d9b3b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Classes/ASIHTTPRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@


// Automatically set on build
NSString *ASIHTTPRequestVersion = @"v1.6.1-8 2010-04-12";
NSString *ASIHTTPRequestVersion = @"v1.6.1-9 2010-04-12";

NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";

Expand Down
5 changes: 1 addition & 4 deletions Classes/S3/ASIS3BucketRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
// Private stuff
@interface ASIS3BucketRequest ()
@property (retain, nonatomic) ASIS3BucketObject *currentObject;
@property (retain, nonatomic) NSString *currentXMLElementContent;
@property (retain, nonatomic) NSMutableArray *currentXMLElementStack;
@property (retain) NSMutableArray *objects;
@property (retain) NSMutableArray *commonPrefixes;
@property (assign) BOOL isTruncated;
Expand Down Expand Up @@ -176,6 +174,5 @@ - (id)copyWithZone:(NSZone *)zone
@synthesize maxResultCount;
@synthesize delimiter;
@synthesize isTruncated;
@synthesize currentXMLElementContent;
@synthesize currentXMLElementStack;

@end
2 changes: 2 additions & 0 deletions Classes/S3/ASIS3Request.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,6 @@ typedef enum _ASIS3ErrorType {
@property (retain) NSString *accessKey;
@property (retain) NSString *secretAccessKey;
@property (retain) NSString *accessPolicy;
@property (retain) NSString *currentXMLElementContent;
@property (retain) NSMutableArray *currentXMLElementStack;
@end
2 changes: 0 additions & 2 deletions Classes/S3/ASIS3Request.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
// Private stuff
@interface ASIS3Request ()
+ (NSData *)HMACSHA1withKey:(NSString *)key forString:(NSString *)string;
@property (retain, nonatomic) NSString *currentXMLElementContent;
@property (retain, nonatomic) NSMutableArray *currentXMLElementStack;
@end

@implementation ASIS3Request
Expand Down
5 changes: 0 additions & 5 deletions Classes/S3/ASIS3ServiceRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ @interface ASIS3ServiceRequest ()
@property (retain, nonatomic) ASIS3Bucket *currentBucket;
@property (retain, nonatomic) NSString *ownerID;
@property (retain, nonatomic) NSString *ownerName;

@property (retain, nonatomic) NSMutableArray *currentXMLElementStack;
@property (retain, nonatomic) NSString *currentXMLElementContent;
@end

@implementation ASIS3ServiceRequest
Expand Down Expand Up @@ -73,8 +70,6 @@ - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName names
}

@synthesize buckets;
@synthesize currentXMLElementContent;
@synthesize currentXMLElementStack;
@synthesize currentBucket;
@synthesize ownerID;
@synthesize ownerName;
Expand Down

0 comments on commit f8d9b3b

Please sign in to comment.