From e6a4c2d52ca7e208143bade96d34118937bc48a8 Mon Sep 17 00:00:00 2001 From: mccallum Date: Wed, 17 Apr 1996 16:40:47 +0000 Subject: [PATCH] Don't include . 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 --- Headers/gnustep/base/String.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Headers/gnustep/base/String.h b/Headers/gnustep/base/String.h index 6b6f0c9c6..6b75a9d3d 100644 --- a/Headers/gnustep/base/String.h +++ b/Headers/gnustep/base/String.h @@ -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 #include #include -#include +//#include #include typedef unsigned short Character; @@ -47,7 +47,7 @@ typedef unsigned short Character; /* Think about changing these names to avoid conflicts with OpenStep? */ -@protocol String +@protocol String // 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 */