From 7ddfe3e3df0e7533c7751a73f1bce3bdc7b62f69 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 4 Feb 2004 00:14:00 +0000 Subject: [PATCH] Remove uses of the 'casts as lvalues' gcc extension. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18534 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 9 +++++++++ Headers/Foundation/NSObject.h | 2 +- Source/Additions/GSXML.m | 2 +- Source/GSDictionary.m | 2 +- Source/NSNotificationCenter.m | 2 +- Source/NSProtocolChecker.m | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa1a3ea02..6cbea3c27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-02-04 01:10 Alexander Malmberg + + * Headers/Foundation/NSObject.h (ASSIGNCOPY), + Source/GSDictionary.m (GSI_MAP_RETAIN_KEY), + Source/NSNotificationCenter.m (-init), + Source/NSProtocolChecker.m (-forwardInvocation:), + Source/Additions/GSXML.m (-initWithDocument:): Remove uses of the + now deprecated "casts as lvalues" gcc extension. + 2004-02-02 Richard Frith-Macdonald * Source/NSPropertyList.m: Added class by Fred Kiefer to decode diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h index 8a9fd86c5..224823de2 100644 --- a/Headers/Foundation/NSObject.h +++ b/Headers/Foundation/NSObject.h @@ -467,7 +467,7 @@ if (__value != __object) \ { \ __value = [__value copy]; \ } \ - (id)object = __value; \ + object = __value; \ if (__object != nil) \ { \ [__object release]; \ diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m index 880f439a2..4548c9c54 100644 --- a/Source/Additions/GSXML.m +++ b/Source/Additions/GSXML.m @@ -3743,7 +3743,7 @@ fatalErrorFunction(void *ctx, const unsigned char *msg, ...) - (id) initWithDocument: (GSXMLDocument *)d { ASSIGN (_document, d); - ((xmlXPathContext*)_lib) = xmlXPathNewContext ([_document lib]); + _lib = xmlXPathNewContext ([_document lib]); ((xmlXPathContext*)_lib)->node = xmlDocGetRootElement ([_document lib]); return self; diff --git a/Source/GSDictionary.m b/Source/GSDictionary.m index 01ef34af7..40b477ccf 100644 --- a/Source/GSDictionary.m +++ b/Source/GSDictionary.m @@ -43,7 +43,7 @@ #define GSI_MAP_VTYPES GSUNION_OBJ #define GSI_MAP_HASH(M, X) [X.obj hash] #define GSI_MAP_EQUAL(M, X,Y) [X.obj isEqual: Y.obj] -#define GSI_MAP_RETAIN_KEY(M, X) ((id)(X).obj) = \ +#define GSI_MAP_RETAIN_KEY(M, X) ((X).obj) = \ [((id)(X).obj) copyWithZone: map->zone] #include "GNUstepBase/GSIMap.h" diff --git a/Source/NSNotificationCenter.m b/Source/NSNotificationCenter.m index 759389372..645d00917 100644 --- a/Source/NSNotificationCenter.m +++ b/Source/NSNotificationCenter.m @@ -589,7 +589,7 @@ static NSNotificationCenter *default_center = nil; { if ((self = [super init]) != nil) { - TABLE = newNCTable(); + _table = newNCTable(); } return self; } diff --git a/Source/NSProtocolChecker.m b/Source/NSProtocolChecker.m index b736ee786..45563c7ff 100644 --- a/Source/NSProtocolChecker.m +++ b/Source/NSProtocolChecker.m @@ -75,7 +75,7 @@ { if (((id)buffer) == _myTarget) { - ((id)buffer) = self; + buffer = self; [anInvocation setReturnValue: buffer]; } }