From: helge Date: Tue, 4 Jan 2005 17:36:37 +0000 (+0000) Subject: fixed some Xcode warnings X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ad0c7b5a84890c1c8e1c2b390a432165740918e;p=sope fixed some Xcode warnings git-svn-id: http://svn.opengroupware.org/SOPE/trunk@485 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog index a80b11d5..3a4a479b 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,8 @@ +2005-01-04 Helge Heß + + * common.h: streamline NeXT/APPLE/COCOA Foundation library define into + just COCOA_Foundation_LIBRARY (fixes a warning) (v4.5.14) + 2005-01-04 Marcus Mueller * OFSWebMethodRenderer.m, OFSWebMethod.m, common.h: removed warnings diff --git a/sope-appserver/SoOFS/common.h b/sope-appserver/SoOFS/common.h index cf06fdf4..14f499cb 100644 --- a/sope-appserver/SoOFS/common.h +++ b/sope-appserver/SoOFS/common.h @@ -24,7 +24,10 @@ #import -#if NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY +#if NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY || \ + COCOA_Foundation_LIBRARY +#define COCOA_Foundation_LIBRARY 1 + # include # include #endif diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog index f006f0dd..8c7bd601 100644 --- a/sope-gdl1/GDLAccess/ChangeLog +++ b/sope-gdl1/GDLAccess/ChangeLog @@ -1,3 +1,8 @@ +2005-01-04 Helge Hess + + * EOAttribute.m, EOFaultHandler.m, EODatabaseFaultResolver.m: added + casts to avoid compile warnings with Xcode (v4.5.44) + 2004-12-14 Marcus Mueller * v4.5.43 diff --git a/sope-gdl1/GDLAccess/EOAttribute.m b/sope-gdl1/GDLAccess/EOAttribute.m index 5f857a81..09b49453 100644 --- a/sope-gdl1/GDLAccess/EOAttribute.m +++ b/sope-gdl1/GDLAccess/EOAttribute.m @@ -23,7 +23,6 @@ If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - // $Id: EOAttribute.m 1 2004-08-20 10:38:46Z znek $ #import "common.h" @@ -630,7 +629,7 @@ static inline void _addToPropList(NSMutableDictionary *propertyList, if (NSDataClass == nil) NSDataClass = [NSData class]; if (NSStringClass == nil) NSStringClass = [NSString class]; - if ([[*_value class] isKindOfClass:NSDataClass]) { + if ([(NSObject *)[*_value class] isKindOfClass:NSDataClass]) { unsigned len; len = [*_value length]; @@ -652,7 +651,7 @@ static inline void _addToPropList(NSMutableDictionary *propertyList, return e; } } - else if ([[*_value class] isKindOfClass:NSStringClass]) { + else if ([(NSObject *)[*_value class] isKindOfClass:NSStringClass]) { unsigned len; len = [*_value cStringLength]; diff --git a/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m b/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m index e0e19404..dbd6fd16 100644 --- a/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m +++ b/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m @@ -92,7 +92,7 @@ self->qualifier = RETAIN(aQualifier); self->fetchOrder = RETAIN(aFetchOrder); - NSAssert([self->targetClass isKindOfClass:[NSArray class]], + NSAssert([(NSObject *)self->targetClass isKindOfClass:[NSArray class]], @"target class of an array fault is not an array class"); } return self; @@ -120,7 +120,7 @@ unsigned int oldRetainCount; BOOL inTransaction; - NSAssert([self->targetClass isKindOfClass:[NSArray class]], + NSAssert([(NSObject *)self->targetClass isKindOfClass:[NSArray class]], @"target class of an array fault is not an array class"); oldRetainCount = [_fault retainCount]; diff --git a/sope-gdl1/GDLAccess/EOFaultHandler.m b/sope-gdl1/GDLAccess/EOFaultHandler.m index a52a9c6e..4085cbc6 100644 --- a/sope-gdl1/GDLAccess/EOFaultHandler.m +++ b/sope-gdl1/GDLAccess/EOFaultHandler.m @@ -92,7 +92,7 @@ return (class_get_instance_method(class, _selector) != NULL) ? YES : NO; #else # warning TODO: use NeXT/Apple runtime function - return [class methodForSelector:_selector] ? YES : NO; + return [(NSObject *)class methodForSelector:_selector] ? YES : NO; #endif } diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version index e36353c1..6053c6f7 100644 --- a/sope-gdl1/GDLAccess/Version +++ b/sope-gdl1/GDLAccess/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=43 +SUBMINOR_VERSION:=44 diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog index 8f6174e4..058be256 100644 --- a/sope-mime/ChangeLog +++ b/sope-mime/ChangeLog @@ -1,3 +1,7 @@ +2005-01-04 Helge Hess + + * NGImap4: fixed a small warning with Xcode (v4.5.205) + 2004-12-09 Helge Hess * NGMime: fixed an issue with future date headers and libFoundation diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog index 4be5fd03..11cf5b79 100644 --- a/sope-mime/NGImap4/ChangeLog +++ b/sope-mime/NGImap4/ChangeLog @@ -1,3 +1,7 @@ +2005-01-04 Helge Hess + + * NGSieveClient.m: fixed a warning when compiling with Xcode + 2004-12-14 Marcus Mueller * NGImap4.xcode: minor fixes and updated diff --git a/sope-mime/NGImap4/NGSieveClient.m b/sope-mime/NGImap4/NGSieveClient.m index fc3275e1..b3749604 100644 --- a/sope-mime/NGImap4/NGSieveClient.m +++ b/sope-mime/NGImap4/NGSieveClient.m @@ -224,7 +224,7 @@ static BOOL debugImap4 = NO; return nil; } - self->io = [[NGBufferedStream alloc] initWithSource:self->socket]; + self->io = [[NGBufferedStream alloc] initWithSource:(id)self->socket]; self->parser = [[NGImap4ResponseParser alloc] initWithStream:self->socket]; /* receive greeting from server without tag-id */ diff --git a/sope-mime/Version b/sope-mime/Version index cef3b420..7c699373 100644 --- a/sope-mime/Version +++ b/sope-mime/Version @@ -2,6 +2,6 @@ MAJOR_VERSION:=4 MINOR_VERSION:=5 -SUBMINOR_VERSION:=204 +SUBMINOR_VERSION:=205 # v4.2.149 requires libNGStreams v4.2.34