From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 17 Apr 2007 21:42:21 +0000 (+0000)
Subject: fixed a few warnings when compiling against GNUstep
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2c45ef4118e0dcb50e940b19b0cab9c65f0b175;p=sope

fixed a few warnings when compiling against GNUstep


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1470 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog
index 0810e125..5bdc218e 100644
--- a/sope-core/EOControl/ChangeLog
+++ b/sope-core/EOControl/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-17  Helge Hess  <helge.hess@opengroupware.org>
+
+	* EOKeyValueCoding.m: fixed a gcc4 warning (v4.7.73)
+
 2007-01-15  Stephane Corthesy  <stephane@sente.ch>
 
 	* EOQualifierParser.m (_parseValue): fixed a bug in the qualifier
diff --git a/sope-core/EOControl/EOKeyValueCoding.m b/sope-core/EOControl/EOKeyValueCoding.m
index 7d9f24d1..96436dee 100644
--- a/sope-core/EOControl/EOKeyValueCoding.m
+++ b/sope-core/EOControl/EOKeyValueCoding.m
@@ -1558,7 +1558,7 @@ static void doubleIvarSetFunc(void* info1, void* info2, id self, id val) {
       register id o;
       
       o = [objAtIdx(self, @selector(objectAtIndex:), i) valueForKey:_key];
-      objects[i] = o ? o : null;
+      objects[i] = o ? o : (id)null;
     }
     
     result = [NSArray arrayWithObjects:objects count:cc];
diff --git a/sope-core/EOControl/Version b/sope-core/EOControl/Version
index c897650b..c85fef4a 100644
--- a/sope-core/EOControl/Version
+++ b/sope-core/EOControl/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=72
+SUBMINOR_VERSION:=73
diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 9a29b3c4..1e5b53c4 100644
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-17  Helge Hess  <helge.hess@opengroupware.org>
+
+	* NGExtensions/NSString+Ext.h: expose a few GNUstep NSString
+	  extensions (v4.7.192)
+
 2006-11-19  Helge Hess  <helge.hess@opengroupware.org>
 
 	* v4.5.191
diff --git a/sope-core/NGExtensions/NGExtensions/NSString+Ext.h b/sope-core/NGExtensions/NGExtensions/NSString+Ext.h
index 18cff011..d25110e4 100644
--- a/sope-core/NGExtensions/NGExtensions/NSString+Ext.h
+++ b/sope-core/NGExtensions/NGExtensions/NSString+Ext.h
@@ -24,9 +24,9 @@
 
 #import <Foundation/NSString.h>
 
-/* specific to gstep-base, supported in libFoundation */
+/* was specific to gstep-base and later removed, supported in libFoundation */
 
-#if !LIB_FOUNDATION_LIBRARY && !GNUSTEP_BASE_LIBRARY
+#if !LIB_FOUNDATION_LIBRARY
 
 @interface NSString(GSAdditions)
 
diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index 25359895..9abe194b 100644
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=191
+SUBMINOR_VERSION:=192
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39
diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 460ba493..5014df42 100644
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-17  Helge Hess  <helge.hess@opengroupware.org>
+
+	* EOSQLExpression.m: fixed a gcc4 warning (v4.7.59)
+
 2006-08-15  Helge Hess  <helge.hess@opengroupware.org>
 
 	* EOCustomValues.m: added special support for lF NSTemporaryString
diff --git a/sope-gdl1/GDLAccess/EOSQLExpression.m b/sope-gdl1/GDLAccess/EOSQLExpression.m
index 30a69da7..4570eac6 100644
--- a/sope-gdl1/GDLAccess/EOSQLExpression.m
+++ b/sope-gdl1/GDLAccess/EOSQLExpression.m
@@ -1159,8 +1159,8 @@ NSString *EOBindVariableValueKey       = @"value";
     buf[i] = '\0';
     
     return (didSomething)
-      ? [NSString stringWithCString:buf length:i]
-      : _pattern;
+      ? (NSString *)[NSString stringWithCString:buf length:i]
+      : (NSString *)_pattern;
   }
   return _pattern;
 }
diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 31494853..de3d3ecd 100644
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=58
+SUBMINOR_VERSION:=59