From 6b264197fd4291beb4889a34e210cf4384e2858c Mon Sep 17 00:00:00 2001 From: mccallum Date: Sat, 3 May 1997 21:04:39 +0000 Subject: [PATCH] Temporarily comment out some code with #if 0/1 so it will compile. Get Adam Fedor or someone to fix it. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2331 72102866-910b-0410-8b05-ffd578937521 --- Source/NSBundle.m | 18 +++++++++++++++--- Source/NSCharacterSet.m | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Source/NSBundle.m b/Source/NSBundle.m index df13805b8..3ba05b9ee 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -274,6 +274,7 @@ _bundle_load_callback(Class theClass, Category *theCategory) return [[[NSBundle alloc] initWithPath: path] autorelease]; } +#if 0 + (NSString *) pathForResource: (NSString *)name ofType: (NSString *)ext inDirectory: (NSString *)bundlePath @@ -283,16 +284,22 @@ _bundle_load_callback(Class theClass, Category *theCategory) inDirectory:bundlePath withVersion:0]; } +#endif + (NSString *) pathForResource: (NSString *)name ofType: (NSString *)ext inDirectory: (NSString *)bundlePath withVersion: (int)version { - NSBundle* bundle = [NSBundle bundleWithPath:bundlePath]; +#if 1 + [self notImplemented:_cmd]; + return nil; +#else + NSBundle* bundle = [NSBundle bundleWithPath:bundlePath]; - [bundle setBundleVersion:version]; - return [bundle pathForResource:name ofType:ext inDirectory:nil]; + [bundle setBundleVersion:version]; + return [bundle pathForResource:name ofType:ext inDirectory:nil]; +#endif } - initWithPath:(NSString *)path; @@ -523,9 +530,14 @@ _bundle_load_callback(Class theClass, Category *theCategory) - (NSString *) pathForResource: (NSString *)name ofType: (NSString *)ext; { +#if 1 + [self notImplemented: _cmd]; + return nil; +#else return [self pathForResource: name ofType: ext inDirectory: nil]; +#endif } + (NSString *) pathForResource: (NSString *)name diff --git a/Source/NSCharacterSet.m b/Source/NSCharacterSet.m index 72a895839..ad04fd338 100644 --- a/Source/NSCharacterSet.m +++ b/Source/NSCharacterSet.m @@ -79,6 +79,9 @@ static NSLock* cache_lock = nil; if (cache_set[number] == nil) { NS_DURING +#if 1 + path = nil; +#else path = [gstep_base_bundle pathForResource:setname ofType:@"dat" inDirectory:NSCharacterSet_PATH]; @@ -89,6 +92,7 @@ static NSLock* cache_lock = nil; ofType:@"dat" inDirectory:@"../NSCharacterSets"]; } +#endif if (path == nil || [path length] == 0) {