mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 08:26:27 +00:00
Don't include <Foundation/NSString.h>. Don't have String protocol
inherit NSString protocol. We were having trouble with circular dependancies. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1424 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
9c0cefa9df
commit
a6e29b7a25
1 changed files with 4 additions and 10 deletions
|
@ -26,13 +26,13 @@
|
|||
|
||||
/* xxx These method names need to be fixed because we will get
|
||||
type conflicts with GNUSTEP.
|
||||
Perhaps I'll just get rid of the GNU String objects and just
|
||||
transfer this functionality into NSSTring and friends. */
|
||||
I will do the work to merge NSString and GNU String in the same
|
||||
manner as NSArray and GNU Array. */
|
||||
|
||||
#include <gnustep/base/preface.h>
|
||||
#include <gnustep/base/IndexedCollection.h>
|
||||
#include <gnustep/base/ValueHolding.h>
|
||||
#include <Foundation/NSString.h>
|
||||
//#include <Foundation/NSString.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
typedef unsigned short Character;
|
||||
|
@ -47,7 +47,7 @@ typedef unsigned short Character;
|
|||
|
||||
/* Think about changing these names to avoid conflicts with OpenStep? */
|
||||
|
||||
@protocol String <NSObject, ValueGetting, IndexedCollecting, NSString>
|
||||
@protocol String <NSObject, ValueGetting, IndexedCollecting>
|
||||
|
||||
// INITIALIZING NEWLY ALLOCATED STRINGS. DON'T FORGET TO RELEASE THEM!;
|
||||
- init;
|
||||
|
@ -173,10 +173,4 @@ typedef unsigned short Character;
|
|||
@interface ConstantString : CString
|
||||
@end
|
||||
|
||||
#if 0 /* Moved to foundation/NSString.h */
|
||||
/* The compiler makes @""-strings into NXConstantString's */
|
||||
@interface NXConstantString : ConstantString
|
||||
@end
|
||||
#endif /* 0 */
|
||||
|
||||
#endif /* __String_h_OBJECTS_INCLUDE */
|
||||
|
|
Loading…
Reference in a new issue