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 0810e12589cb2777cd5cda3b0cb2796eea1acd2b..5bdc218edd3510d1b7e4e9a26f25190a95be7f89 100644 (file)
--- 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 7d9f24d1adbcf6a86dc14f3dc64e925bbecda8a5..96436dee66c41d3087e60b0c31a66cf59ff4264e 100644 (file)
--- 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 c897650b08cc758e1efd972299a63cdc197cde02..c85fef4a95cceb10782afc33008f9aba6332475a 100644 (file)
--- 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 9a29b3c40df900cd46a2c5b83a5183c0213e9fa2..1e5b53c4d80a5186f7ed65e01710ad7877be964d 100644 (file)
--- 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 18cff01100a9a0a99084c38dfd8f5622d10dd0f5..d25110e4edfef3cec9348acf7e6ea61f591167e5 100644 (file)
--- 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 25359895d5d230aab6d8fdcc2f73045feb9b02c6..9abe194b9d4b8642299868ae361494f0e3d1c49b 100644 (file)
--- 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 460ba4931e18a9a5a1b67fa4c959ae43451e73e2..5014df42523d8dcc28b9d3459a7b00d62b7ca993 100644 (file)
--- 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 30a69da702a829df423da3eb42177ee01f11c3e7..4570eac63043b6ca325c2148f96e73af4752db68 100644 (file)
--- 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 31494853fc6418695cfabaf78b7d27ee87f6e96d..de3d3ecd1a652cb6df956911af35bddf3a29e7d0 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=58
+SUBMINOR_VERSION:=59