cvs -z9 diff -u -wb (in directory C:\code\ode\)
? msvc71
? ode/include/ode/config.h
cvs server: Diffing .
cvs server: Diffing CVSROOT
cvs server: Diffing ode
cvs server: Diffing ode/OPCODE
cvs server: Diffing ode/OPCODE/Ice
cvs server: Diffing ode/VC6
cvs server: Diffing ode/VC6/Samples
cvs server: Diffing ode/VC6/_configs
cvs server: Diffing ode/config
cvs server: Diffing ode/contrib
cvs server: Diffing ode/contrib/BreakableJoints
cvs server: Diffing ode/contrib/BreakableJoints/diff
cvs server: Diffing ode/contrib/DotNetManaged
cvs server: Diffing ode/contrib/DotNetManaged/Release
cvs server: Diffing ode/contrib/GeomTransformGroup
cvs server: Diffing ode/contrib/Mac_CFMCarbon
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source/drawstuff
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source/drawstuff/src
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source/include
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source/include/GL
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source/include/ode
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source/ode
cvs server: Diffing ode/contrib/Mac_CFMCarbon/mac_source/ode/test
cvs server: Diffing ode/contrib/TerrainAndCone
cvs server: Diffing ode/contrib/dCylinder
cvs server: Diffing ode/contrib/dRay
cvs server: Diffing ode/contrib/dRay/Include
cvs server: Diffing ode/contrib/dRay/Test
cvs server: Diffing ode/contrib/msvc7
cvs server: Diffing ode/contrib/msvc7/ode_default
cvs server: Diffing ode/contrib/msvc7/ode_iterative_tricollide
cvs server: Diffing ode/contrib/msvc7/ode_triangle_collider
cvs server: Diffing ode/drawstuff
cvs server: Diffing ode/drawstuff/dstest
cvs server: Diffing ode/drawstuff/src
cvs server: Diffing ode/drawstuff/textures
cvs server: Diffing ode/include
cvs server: Diffing ode/include/drawstuff
cvs server: Diffing ode/include/ode
Index: ode/include/ode/common.h
===================================================================
RCS file: /cvsroot/opende/ode/include/ode/common.h,v
retrieving revision 1.31
diff -u -w -b -r1.31 common.h
--- ode/include/ode/common.h 2 Aug 2003 16:02:40 -0000 1.31
+++ ode/include/ode/common.h 16 Apr 2004 04:06:51 -0000
@@ -159,7 +159,7 @@
*/
#define dALLOCA16(n) \
- ((char*)dEFFICIENT_SIZE(((int)(alloca((n)+(EFFICIENT_ALIGNMENT-1))))))
+ ((char*)dEFFICIENT_SIZE(((size_t)(alloca((n)+(EFFICIENT_ALIGNMENT-1))))))
/* internal object types (all prefixed with `dx') */
Index: ode/include/ode/memory.h
===================================================================
RCS file: /cvsroot/opende/ode/include/ode/memory.h,v
retrieving revision 1.6
diff -u -w -b -r1.6 memory.h
--- ode/include/ode/memory.h 25 Jun 2002 23:46:15 -0000 1.6
+++ ode/include/ode/memory.h 16 Apr 2004 04:06:51 -0000
@@ -25,6 +25,8 @@
#ifndef _ODE_MEMORY_H_
#define _ODE_MEMORY_H_
+#include <stdlib.h> // for size_t
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -46,9 +48,9 @@
dFreeFunction *dGetFreeHandler ();
/* allocate and free memory. */
-void * dAlloc (int size);
-void * dRealloc (void *ptr, int oldsize, int newsize);
-void dFree (void *ptr, int size);
+void * dAlloc (size_t size);
+void * dRealloc (void *ptr, size_t oldsize, size_t newsize);
+void dFree (void *ptr, size_t size);
/* when alloc debugging is turned on, this indicates that the given block of
* alloc()ed memory should not be reported as "still in use" when the program
cvs server: Diffing ode/lib
cvs server: Diffing ode/ode
cvs server: Diffing ode/ode/doc
cvs server: Diffing ode/ode/doc/pix
cvs server: Diffing ode/ode/fbuild
cvs server: Diffing ode/ode/src
Index: ode/ode/src/collision_trimesh_internal.h
===================================================================
RCS file: /cvsroot/opende/ode/ode/src/collision_trimesh_internal.h,v
retrieving revision 1.8
diff -u -w -b -r1.8 collision_trimesh_internal.h
--- ode/ode/src/collision_trimesh_internal.h 9 Apr 2004 02:59:56 -0000 1.8
+++ ode/ode/src/collision_trimesh_internal.h 16 Apr 2004 04:06:51 -0000
@@ -223,7 +223,7 @@
// Performs a callback
inline bool Callback(dxTriMesh* TriMesh, dxGeom* Object, int TriIndex){
if (TriMesh->Callback != null){
- return TriMesh->Callback(TriMesh, Object, TriIndex);
+ return TriMesh->Callback(TriMesh, Object, TriIndex) ? true : false;
}
else return true;
}
Index: ode/ode/src/collision_trimesh_ray.cpp
===================================================================
RCS file: /cvsroot/opende/ode/ode/src/collision_trimesh_ray.cpp,v
retrieving revision 1.4
diff -u -w -b -r1.4 collision_trimesh_ray.cpp
--- ode/ode/src/collision_trimesh_ray.cpp 29 Aug 2003 21:26:11 -0000 1.4
+++ ode/ode/src/collision_trimesh_ray.cpp 16 Apr 2004 04:06:51 -0000
@@ -45,9 +45,9 @@
dGeomRayGetParams(RayGeom, &FirstContact, &BackfaceCull);
int ClosestHit = dGeomRayGetClosestHit(RayGeom);
- Collider.SetFirstContact(FirstContact);
- Collider.SetClosestHit(ClosestHit);
- Collider.SetCulling(BackfaceCull);
+ Collider.SetFirstContact(FirstContact ? true : false);
+ Collider.SetClosestHit(ClosestHit ? true : false);
+ Collider.SetCulling(BackfaceCull ? true : false);
Collider.SetMaxDist(Length);
dVector3 Origin, Direction;
Index: ode/ode/src/memory.cpp
===================================================================
RCS file: /cvsroot/opende/ode/ode/src/memory.cpp,v
retrieving revision 1.9
diff -u -w -b -r1.9 memory.cpp
--- ode/ode/src/memory.cpp 25 Jun 2002 23:46:18 -0000 1.9
+++ ode/ode/src/memory.cpp 16 Apr 2004 04:06:51 -0000
@@ -138,7 +138,7 @@
}
-void * dAlloc (int size)
+void * dAlloc (size_t size)
{
#ifdef dDEBUG_ALLOC
if (size < 1) dDebug (0,"bad block size to Alloc()");
@@ -174,7 +174,7 @@
}
-void * dRealloc (void *ptr, int oldsize, int newsize)
+void * dRealloc (void *ptr, size_t oldsize, size_t newsize)
{
#ifdef dDEBUG_ALLOC
if (ptr==0) dDebug (0,"Realloc() called with ptr==0");
@@ -196,7 +196,7 @@
}
-void dFree (void *ptr, int size)
+void dFree (void *ptr, size_t size)
{
if (!ptr) return;
#ifdef dDEBUG_ALLOC
Index: ode/ode/src/obstack.cpp
===================================================================
RCS file: /cvsroot/opende/ode/ode/src/obstack.cpp,v
retrieving revision 1.7
diff -u -w -b -r1.7 obstack.cpp
--- ode/ode/src/obstack.cpp 25 Jun 2002 23:46:18 -0000 1.7
+++ ode/ode/src/obstack.cpp 16 Apr 2004 04:06:51 -0000
@@ -29,10 +29,10 @@
// macros and constants
#define ROUND_UP_OFFSET_TO_EFFICIENT_SIZE(arena,ofs) \
- ofs = (int) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) );
+ ofs = (size_t) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) );
#define MAX_ALLOC_SIZE \
- ((int)(dOBSTACK_ARENA_SIZE - sizeof (Arena) - EFFICIENT_ALIGNMENT + 1))
+ ((size_t)(dOBSTACK_ARENA_SIZE - sizeof (Arena) - EFFICIENT_ALIGNMENT + 1))
//****************************************************************************
// dObStack
Index: ode/ode/src/timer.cpp
===================================================================
RCS file: /cvsroot/opende/ode/ode/src/timer.cpp,v
retrieving revision 1.10
diff -u -w -b -r1.10 timer.cpp
--- ode/ode/src/timer.cpp 24 May 2003 19:20:59 -0000 1.10
+++ ode/ode/src/timer.cpp 16 Apr 2004 04:06:51 -0000
@@ -342,7 +342,8 @@
void dTimerReport (FILE *fout, int average)
{
- int i,maxl;
+ int i;
+ size_t maxl;
double ccunit = 1.0/dTimerTicksPerSecond();
fprintf (fout,"\nTimer Report (");
fprintDoubleWithPrefix (fout,ccunit,"%.2f ");
@@ -352,7 +353,7 @@
// get maximum description length
maxl = 0;
for (i=0; i<num; i++) {
- int l = strlen (event[i].description);
+ size_t l = strlen (event[i].description);
if (l > maxl) maxl = l;
}
cvs server: Diffing ode/ode/test
Index: ode/ode/test/test_boxstack.cpp
===================================================================
RCS file: /cvsroot/opende/ode/ode/test/test_boxstack.cpp,v
retrieving revision 1.20
diff -u -w -b -r1.20 test_boxstack.cpp
--- ode/ode/test/test_boxstack.cpp 10 Jun 2003 14:03:33 -0000 1.20
+++ ode/ode/test/test_boxstack.cpp 16 Apr 2004 04:06:51 -0000
@@ -132,7 +132,8 @@
static void command (int cmd)
{
- int i,j,k;
+ size_t i;
+ int j,k;
dReal sides[3];
dMass m;
cvs server: Diffing ode/tools
***** CVS exited normally with code 1 *****