From: <bi...@us...> - 2007-10-14 23:37:44
|
Revision: 974 http://oorexx.svn.sourceforge.net/oorexx/?rev=974&view=rev Author: bigrixx Date: 2007-10-14 16:37:47 -0700 (Sun, 14 Oct 2007) Log Message: ----------- Some more warning cleanup. Modified Paths: -------------- sandbox/rick/warnings/kernel/platform/unix/ThreadSupport.hpp sandbox/rick/warnings/kernel/runtime/MemorySegment.cpp sandbox/rick/warnings/kernel/runtime/RexxCore.h sandbox/rick/warnings/kernel/runtime/RexxEnvelope.cpp sandbox/rick/warnings/kernel/runtime/RexxEnvelope.hpp sandbox/rick/warnings/kernel/runtime/RexxMemory.cpp sandbox/rick/warnings/kernel/runtime/RexxMemory.hpp Modified: sandbox/rick/warnings/kernel/platform/unix/ThreadSupport.hpp =================================================================== --- sandbox/rick/warnings/kernel/platform/unix/ThreadSupport.hpp 2007-10-14 23:03:37 UTC (rev 973) +++ sandbox/rick/warnings/kernel/platform/unix/ThreadSupport.hpp 2007-10-14 23:37:47 UTC (rev 974) @@ -48,8 +48,6 @@ #include <pthread.h> #include <stdlib.h> -#include "RexxCore.h" - #ifdef AIX void RxLumCntl( long * result ); #endif Modified: sandbox/rick/warnings/kernel/runtime/MemorySegment.cpp =================================================================== --- sandbox/rick/warnings/kernel/runtime/MemorySegment.cpp 2007-10-14 23:03:37 UTC (rev 973) +++ sandbox/rick/warnings/kernel/runtime/MemorySegment.cpp 2007-10-14 23:37:47 UTC (rev 974) @@ -784,7 +784,7 @@ { float freePercent = freeMemoryPercentage(); - memory->verboseMessage("Normal segment set free memory percentage is %d\%\n", freePercent * 100.0); + memory->verboseMessage("Normal segment set free memory percentage is %d\n", (int)(freePercent * 100.0)); /* if we are less than 30% full, we should try to expand to the */ /* 30% mark. */ Modified: sandbox/rick/warnings/kernel/runtime/RexxCore.h =================================================================== --- sandbox/rick/warnings/kernel/runtime/RexxCore.h 2007-10-14 23:03:37 UTC (rev 973) +++ sandbox/rick/warnings/kernel/runtime/RexxCore.h 2007-10-14 23:37:47 UTC (rev 974) @@ -1140,10 +1140,10 @@ #define ObjectNeedsMarking(oref) ((oref) != OREF_NULL && !ObjectIsMarked(oref)) #define memory_mark(oref) if (ObjectNeedsMarking(oref)) memoryObject.mark((RexxObject *)(oref)) -#define memory_mark_general(oref) (memoryObject.markGeneral((RexxObject **)&(oref))) +#define memory_mark_general(oref) (memoryObject.markGeneral((void *)&(oref))) /* Following macros are for Flattening and unflattening of objects */ -#define flatten_reference(oref,envel) if (oref) envel->flattenReference((RexxObject **)&newThis, newSelf, (RexxObject **)&(oref)) +#define flatten_reference(oref,envel) if (oref) envel->flattenReference((void *)&newThis, newSelf, (void *)&(oref)) /******************************************************************************/ /* Typed method invocation macros */ Modified: sandbox/rick/warnings/kernel/runtime/RexxEnvelope.cpp =================================================================== --- sandbox/rick/warnings/kernel/runtime/RexxEnvelope.cpp 2007-10-14 23:03:37 UTC (rev 973) +++ sandbox/rick/warnings/kernel/runtime/RexxEnvelope.cpp 2007-10-14 23:37:47 UTC (rev 974) @@ -168,13 +168,16 @@ } void RexxEnvelope::flattenReference( - RexxObject **newThis, /* current pointer to flattening obj */ + void *newThisVoid, /* current pointer to flattening obj */ LONG newSelf, /* offset of the flattening object */ - RexxObject **objRef) /* object to process */ + void *objRefVoid) /* object to process */ /******************************************************************************/ /* Function: This method does the copy buffer, */ /******************************************************************************/ { + RexxObject **newThis = (RexxObject **)newThisVoid; + RexxObject **objRef = (RexxObject **)objRefVoid; + RexxObject *newObj; /* new object in buffer */ RexxObject *obj = *objRef; /* get working pointer to object */ RexxObject *proxyObj; /* proxy of the flattened object */ Modified: sandbox/rick/warnings/kernel/runtime/RexxEnvelope.hpp =================================================================== --- sandbox/rick/warnings/kernel/runtime/RexxEnvelope.hpp 2007-10-14 23:03:37 UTC (rev 973) +++ sandbox/rick/warnings/kernel/runtime/RexxEnvelope.hpp 2007-10-14 23:37:47 UTC (rev 974) @@ -63,7 +63,7 @@ void liveGeneral(); void flatten(RexxEnvelope*); RexxObject *unflatten(RexxEnvelope *); - void flattenReference(RexxObject **, LONG, RexxObject **); + void flattenReference(void *, LONG, void *); RexxEnvelope *pack(RexxString *, RexxObject *, RexxString *, RexxArray *); RexxObject *unpack(); void puff(RexxBuffer *, PCHAR); Modified: sandbox/rick/warnings/kernel/runtime/RexxMemory.cpp =================================================================== --- sandbox/rick/warnings/kernel/runtime/RexxMemory.cpp 2007-10-14 23:03:37 UTC (rev 973) +++ sandbox/rick/warnings/kernel/runtime/RexxMemory.cpp 2007-10-14 23:37:47 UTC (rev 974) @@ -1168,12 +1168,13 @@ return newObject; /* and return it */ } -void RexxMemory::markGeneral(RexxObject **pMarkObject) +void RexxMemory::markGeneral(void *obj) /******************************************************************************/ /* Function: Perform various general marking functions such as image save, */ /* image restore, object unflatten, and debug garbage collection */ /******************************************************************************/ { + RexxObject **pMarkObject = (RexxObject **)obj; RexxObject *markObject = *pMarkObject; Modified: sandbox/rick/warnings/kernel/runtime/RexxMemory.hpp =================================================================== --- sandbox/rick/warnings/kernel/runtime/RexxMemory.hpp 2007-10-14 23:03:37 UTC (rev 973) +++ sandbox/rick/warnings/kernel/runtime/RexxMemory.hpp 2007-10-14 23:37:47 UTC (rev 974) @@ -290,7 +290,7 @@ void markObjectsMain(RexxObject *); void killOrphans(RexxObject *); void mark(RexxObject *); - void markGeneral(RexxObject **); + void markGeneral(void *); void collect(); inline RexxObject *saveObject(RexxInternalObject *saveObj) {this->saveTable->add((RexxObject *)saveObj, (RexxObject *)saveObj); return (RexxObject *)saveObj;} inline void discardObject(RexxInternalObject *obj) {this->saveTable->remove((RexxObject *)obj);}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |