kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-21 19:42:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of reserved 'class' keyword that breaks import into Objective-C++. fixes #355

Browse Source 
Added basic spec file that imports the public headers into an Objective-C++ source file.
This commit is contained in:
Blake Watters
2011-09-20 13:04:29 -04:00
parent e535f3abf0
commit 0c96aedc85
6 changed files with 63 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Code/ObjectMapping/RKObjectRouter.m
View File

@@ -37,14 +37,14 @@
[super dealloc];
}
- (void)routeClass:(Class)class toResourcePath:(NSString*)resourcePath forMethodName:(NSString*)methodName escapeRoutedPath:(BOOL)addEscapes {
NSString* className = NSStringFromClass(class);
if (nil == [_routes objectForKey:class]) {
- (void)routeClass:(Class)theClass toResourcePath:(NSString*)resourcePath forMethodName:(NSString*)methodName escapeRoutedPath:(BOOL)addEscapes {
NSString* className = NSStringFromClass(theClass);
if (nil == [_routes objectForKey:theClass]) {
NSMutableDictionary* dictionary = [NSMutableDictionary dictionary];
[_routes setObject:dictionary forKey:class];
[_routes setObject:dictionary forKey:theClass];
}
NSMutableDictionary* classRoutes = [_routes objectForKey:class];
NSMutableDictionary* classRoutes = [_routes objectForKey:theClass];
if ([classRoutes objectForKey:methodName]) {
[NSException raise:nil format:@"A route has already been registered for class '%@' and HTTP method '%@'", className, methodName];
}
@@ -76,17 +76,17 @@
// Public
- (void)routeClass:(Class)class toResourcePath:(NSString*)resourcePath {
[self routeClass:class toResourcePath:resourcePath forMethodName:@"ANY" escapeRoutedPath:YES];
- (void)routeClass:(Class)theClass toResourcePath:(NSString*)resourcePath {
[self routeClass:theClass toResourcePath:resourcePath forMethodName:@"ANY" escapeRoutedPath:YES];
}
- (void)routeClass:(Class)class toResourcePath:(NSString*)resourcePath forMethod:(RKRequestMethod)method {
[self routeClass:class toResourcePath:resourcePath forMethod:method escapeRoutedPath:YES];
- (void)routeClass:(Class)theClass toResourcePath:(NSString*)resourcePath forMethod:(RKRequestMethod)method {
[self routeClass:theClass toResourcePath:resourcePath forMethod:method escapeRoutedPath:YES];
}
- (void)routeClass:(Class)class toResourcePath:(NSString*)resourcePath forMethod:(RKRequestMethod)method escapeRoutedPath:(BOOL)addEscapes {
- (void)routeClass:(Class)theClass toResourcePath:(NSString*)resourcePath forMethod:(RKRequestMethod)method escapeRoutedPath:(BOOL)addEscapes {
NSString* methodName = [self HTTPVerbForMethod:method];
[self routeClass:class toResourcePath:resourcePath forMethodName:methodName escapeRoutedPath:addEscapes];
[self routeClass:theClass toResourcePath:resourcePath forMethodName:methodName escapeRoutedPath:addEscapes];
}
#pragma mark RKRouter