tweaks

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32465 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,45 @@
+2011-03-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSInternal.h:
+	* Source/NSDateFormatter.m:
+	* Source/NSNumberFormatter.m:
+	* Headers/Foundation/NSPortCoder.h:
+	* Headers/Foundation/NSCache.h:
+	* Headers/Foundation/NSSpellServer.h:
+	* Headers/Foundation/NSDecimalNumber.h:
+	* Headers/Foundation/NSBundle.h:
+	* Headers/Foundation/NSTimer.h:
+	* Headers/Foundation/NSScanner.h:
+	* Headers/Foundation/NSDistributedNotificationCenter.h:
+	* Headers/Foundation/NSComparisonPredicate.h:
+	* Headers/Foundation/NSUndoManager.h:
+	* Headers/Foundation/NSDateFormatter.h:
+	* Headers/Foundation/NSAutoreleasePool.h:
+	* Headers/Foundation/NSUserDefaults.h:
+	* Headers/Foundation/NSXMLNode.h:
+	* Headers/Foundation/NSThread.h:
+	* Headers/Foundation/NSHost.h:
+	* Headers/Foundation/NSRegularExpression.h:
+	* Headers/Foundation/NSKeyedArchiver.h:
+	* Headers/Foundation/NSProtocolChecker.h:
+	* Headers/Foundation/NSError.h:
+	* Headers/Foundation/NSPortMessage.h:
+	* Headers/Foundation/NSFileHandle.h:
+	* Headers/Foundation/NSDistributedLock.h:
+	* Headers/Foundation/NSPort.h:
+	* Headers/Foundation/NSSortDescriptor.h:
+	* Headers/Foundation/NSLocale.h:
+	* Headers/Foundation/NSTask.h:
+	* Headers/Foundation/NSArchiver.h:
+	* Headers/Foundation/NSInvocation.h:
+	* Headers/Foundation/NSFileManager.h:
+	* Headers/Foundation/NSNumberFormatter.h:
+	* Headers/Foundation/NSPortNameServer.h:
+	* Headers/Foundation/NSXMLParser.h:
+	* Headers/Foundation/NSIndexPath.h:
+	* Headers/Additions/GNUstepBase/GSMime.h:
+	Tweaks for running in a garbage collecting environment.
+
 2011-03-05  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSBundle.m: AbsolutePathOfExecutable() attempt to fix this

Headers/Additions/GNUstepBase/GSMime.h

@@ -82,7 +82,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 + (NSString*) makeQuoted: (NSString*)v always: (BOOL)flag;

Headers/Foundation/NSArchiver.h

@@ -77,7 +77,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 
@@ -191,7 +191,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSAutoreleasePool.h

@@ -201,7 +201,7 @@ typedef struct autorelease_array_list
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSBundle.h

@@ -126,7 +126,7 @@ GS_EXPORT NSString* const NSLoadedClasses;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSCache.h

@@ -68,7 +68,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 /** 

Headers/Foundation/NSComparisonPredicate.h

@@ -84,7 +84,7 @@ typedef enum _NSPredicateOperatorType
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
   @public
   NSExpression			*_left;

Headers/Foundation/NSDateFormatter.h

@@ -139,7 +139,7 @@ GS_NSDateFormatter_IVARS;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSDecimalNumber.h

@@ -136,7 +136,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSDistributedLock.h

@@ -47,7 +47,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSDistributedNotificationCenter.h

@@ -93,7 +93,7 @@ GS_EXPORT NSString* const GSNetworkNotificationCenterType;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 + (NSNotificationCenter*) defaultCenter;

Headers/Foundation/NSError.h

@@ -128,7 +128,7 @@ GS_EXPORT NSString* const NSCocoaErrorDomain;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSFileHandle.h

@@ -169,7 +169,7 @@ GS_EXPORT NSString * const NSFileHandleOperationException;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 + (id) pipe;

Headers/Foundation/NSFileManager.h

@@ -210,7 +210,7 @@ typedef	uint32_t	OSType;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 
@@ -408,7 +408,7 @@ typedef	uint32_t	OSType;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 - (NSDictionary*) directoryAttributes;

Headers/Foundation/NSHost.h

@@ -51,7 +51,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSIndexPath.h

@@ -57,7 +57,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSInvocation.h

@@ -57,7 +57,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSKeyedArchiver.h

@@ -78,7 +78,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 
@@ -253,7 +253,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSLocale.h

@@ -111,7 +111,7 @@ GS_EXPORT NSString * const NSISO8601Calendar;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSNumberFormatter.h

@@ -149,7 +149,7 @@ GS_NSNumberFormatter_IVARS;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSPort.h

@@ -218,7 +218,7 @@ typedef SOCKET NSSocketNativeHandle;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSPortCoder.h

@@ -101,7 +101,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSPortMessage.h

@@ -58,7 +58,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 /**

Headers/Foundation/NSPortNameServer.h

@@ -67,7 +67,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 + (id) sharedInstance;

Headers/Foundation/NSProtocolChecker.h

@@ -49,7 +49,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSRegularExpression.h

@@ -46,7 +46,7 @@ DEFINE_BLOCK_TYPE(GSRegexBlock, void, NSTextCheckingResult*, NSMatchingFlags, BO
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 + (NSRegularExpression*)regularExpressionWithPattern: (NSString*)aPattern

Headers/Foundation/NSScanner.h

@@ -57,7 +57,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSSortDescriptor.h

@@ -57,7 +57,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSSpellServer.h

@@ -71,7 +71,7 @@ GS_EXPORT NSString *const NSGrammarUserDescription;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSTask.h

@@ -61,7 +61,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSThread.h

@@ -79,7 +79,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSTimer.h

@@ -58,7 +58,7 @@ extern "C" {
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSUndoManager.h

@@ -105,7 +105,7 @@ GS_EXPORT NSString* const NSUndoManagerWillUndoChangeNotification;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSUserDefaults.h

@@ -235,7 +235,7 @@ GS_EXPORT NSString* const GSLocale;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSXMLNode.h

@@ -95,7 +95,7 @@ typedef NSUInteger NSXMLNodeKind;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Headers/Foundation/NSXMLParser.h

@@ -81,7 +81,7 @@ GS_EXPORT NSString* const NSXMLParserErrorDomain;
    * Use this mechanism rather than changing the instance variable
    * layout (see Source/GSInternal.h for details).
    */
-  @private void *_internal GS_UNUSED_IVAR;
+  @private id _internal GS_UNUSED_IVAR;
 #endif
 }
 

Source/GSInternal.h

@@ -35,17 +35,20 @@
  * @public GS_X_IVARS;
  * #  endif
  * #else
- * @private void *_internal GS_UNUSED_IVAR;
+ * @private id _internal GS_UNUSED_IVAR;
  * #endif
  *
  * In the non fragile case, this means that the public header has nothing
  * visible, but the ivars defined in GS_X_IVARS are visible within the
  * implementation.
  *
- * In the fragile case, the '_internal' pinter is visible in the public
- * header, but as an opaque private instance variable, while macros from
- * this file allow the actual memory to be accessed either as a malloc'ed
- * structure or as a private class.
+ * In the fragile case, the '_internal' instance variable is visible in the
+ * public header, but as an opaque private instance variable, while macros
+ * from this file allow the actual memory to be accessed either as a private
+ * class.  The use of a private class rather than simple heap memory is
+ * necessary for garbage collection... the runtime is able to ensure that
+ * garbage collection works properly for the instance variables in the 
+ * private class.
  *
  * Before including the header file containing the public class declaration,
  * you must define GS_X_IVARS (where X is the class name) to be the
@@ -72,32 +75,8 @@
 #if	!GS_NONFRAGILE
 
 /* Code for when we don't have non-fragile instance variables
- * The presence of GS_INTERNAL_STRUCT means that the instance variables are
- * accessible as a struct rather than as a class.
  */
 
-#if	defined(GS_INTERNAL_STRUCT)
-
-/* Start declaration of internal ivars.
- */
-#define	GS_PRIVATE_INTERNAL(name) \
-typedef struct	name ## InternalStruct \
-{ \
-GS_##name##_IVARS; \
-} name ## Internal;
-
-/* Create holder for internal ivars.
- */
-#define	GS_CREATE_INTERNAL(name) \
-_internal = (void*)NSZoneCalloc([self zone], 1, sizeof(name ## Internal));
-
-/* Destroy holder for internal ivars.
- */
-#define	GS_DESTROY_INTERNAL(name) \
-if (_internal != 0) { NSZoneFree([self zone], _internal); _internal = 0; }
-
-#else	/* GS_INTERNAL_STRUCT */
-
 /* Start declaration of internal ivars.
  */
 #define	GS_PRIVATE_INTERNAL(name) \
@@ -113,14 +92,13 @@ GS_##name##_IVARS; \
 /* Create holder for internal ivars.
  */
 #define	GS_CREATE_INTERNAL(name) \
-_internal = (void*)[name ## Internal new];
+_internal = [name ## Internal new];
 
 /* Destroy holder for internal ivars.
  */
 #define	GS_DESTROY_INTERNAL(name) \
-if (_internal != 0) {[(id)_internal release]; _internal = 0; }
+if (nil != _internal) {[_internal release]; _internal = nil; }
 
-#endif	/* GS_INTERNAL_STRUCT */
 
 #undef	internal
 #define	internal	((GSInternal*)_internal)

Source/NSDateFormatter.m

@@ -89,7 +89,6 @@ NSToUDateFormatStyle (NSDateFormatterStyle style)
   void      *_formatter
 
 #define	GSInternal		NSDateFormatterInternal
-#define	GS_INTERNAL_STRUCT	1
 #include	"GSInternal.h"
 GS_PRIVATE_INTERNAL(NSDateFormatter)
 

Source/NSNumberFormatter.m

@@ -207,7 +207,6 @@ ICUToNSRoundingMode (UNumberFormatRoundingMode mode)
   void      *_formatter
  
 #define GSInternal              NSNumberFormatterInternal
-#define GS_INTERNAL_STRUCT      1
 #include        "GSInternal.h"
 GS_PRIVATE_INTERNAL(NSNumberFormatter)